Fix some display bugs