UI Improvements done