[385] [387] Cleaned up templates, using page_header consistently etc.