Develop ui

merge results changes into develop