UI Improvement applied