Develop ui

merge dev-ui into develop
set this to class hidden for now