UI Fixes and changes