moved todo into the right place and fix the page not found problem