Minor Bugs

_changed bugs in UI