Polished the UI
Merge Conflict