Tweaks to UI and bug fixes.