Commit #38 UI changes