first round of UI changes done