Improve UI. Add a little more convenience functionality.