Fix some display issues. More to go but core works.