some repositioning and work to the navigation