Fixes title updating and adds more pages
Reorg of modules