refactor(ui) more cleanup