Fix display bugs from test 20-2-2014