- Updated with optimized code
- Updated UI