Native Nav bar fixes