Added navigation and basic structure