navbar collapse menu and some tidy ups