Some minor display bugs fixed
Merge branch 'DisplayFixes' into development