Tweaked UI and code