Fixing issue with dropdown buttons in navbar
Changing a bit of the hierarchy of pages