UI Bugs Removed And Minor Enhancements