Merge remote-tracking branch 'jhrcek/UI_fix'