fixING navbar
rearranged files, stil ltrying to fix extra part on navbar