IMP : UI Improvements