Remove nav bar changes (will develop in a branch)