Page templating improvements

Close to finishing all modules.