Dynamic nav refactoring

New views & controllers