Merge pull request #59 from apache/ux-improvement

Merging UX-Improvement Branch into Master