Minor code clean up of partials and nav