remove responsive-navbar
rename more variables