Fixes to navigation and layout