Updated navigation and formatting