Feature #5157 - fixing some display problems