tidy up navigation and remove some layout files