Replaced menu with navbar
Merge with previous commit