Much Improvement

a draft of UI design