added more css and a backbutton to navbar
fixed merge