Initial draft with UI changes