Rename navbar-nav to navbar-menu
Tidy up product price CSS
Refactor menus and submenus
Change sold out badges to default label
Merge latest changes