Some improvements in navbar