Re-arrange nav bar