added nav-side controller
refactored buttons