UI Improvements
Add failsafe