Updated navigation and put tab settings in project