Upated TODO and view page stuff