Your proposed modifications sound good, though it is unclear what you mean by better UI. Be sure to clarify the changes you make and why on that modification in your final submission.
