Commit#95 UI changes