Update navigation
Updated templates
Added partials for Page