Move navigation and logout to extra components