Removed todos and added more clear pages in frontpagematter