ui-nav dev
nav-menu and bug fixes