some tests fixed, ui updated