UI issues fixed
Merge remote-tracking branch 'tero/master'