Update the ux.
Merge pull request #1673 from brendandburns/ux

Update the ux.