Commit#100 UI changes