Added navigation and basic layout