UI Changes
- Implemented UI changes as per request