More merge fixes for navigation and settings