nav-bar + reorganized all view code