UI enhancements
UI enhancements
Catched edge cases