Merge "Add nav bar controller"