Fixed the screen controls. Consolidated everything into the nav.js controller