first round UX design
merged develop into issue1 to integrate UX changes