GUI adaption in Navbars

Also removed unused code