#15 Design navbar and move icons