UI Tweaks and Improvements.