add styles and alignment to navbar
fix merge conflict in index.html