Added some stuff to improve UX.

Still a work in progress, but some good things happening.