Ui updates

Matija Obreza requested to merge ui-updates into master

Please check these updates, fix and merge.

Merge request reports