Some UX improvements.
Merge pull request #7 from my-koop/mg_ux

Some UX improvements