Fix some display issues