refactored views with nav partials