Commit #39 UI changes