Added final fixes to navigation