Small UI fixes
Finilizing merge
[Bugfix] Bug #792. Additional fix.