Bug fix for navbar