general overhaul / merging
navbar .php