navbar now works
merged