Fixed display issues [MJ-468]