Fix issue with navbar