Fixed #10
UI Enhancements