Develop ui

merge dev-ui into develop
Could do with more obviously selected button (make text bold?)