fixed navigation and formatting