UI Improvements
Added new UI Elements