UI Improvement Working Done