UI Tweaks & Minor Bug Fixes