Cleanup and extra assets
Better page templates