Made addtional changes to navigation.