Fixes

UI Improvements