Merge "Clean up navigation bar"