Updating branch with navbar commit, etc