Small tweaks to display
Merge branch 'hot_fix_3_1_1' into develop