fixed navbar
merged