Improved UI and other minor edits.