added nav bar, settings contoller