UI display changes

Merged Martynas Kapocius requested to merge marty/correction-logic into develop

Merge request reports