UI Fixes and cleanup