Fixed some display inconsistencies