added icons and fixed up navbars