Fixed various minor bugs
Merge remote-tracking branch 'origin/fix_ui_bugs'

* origin/fix_ui_bugs:
  Fixed various minor bugs