Updated Header and Sidebar Templates.
Update to pages with new app designs
Merge