Move navigation

Move logout into main navigation