Fix some minor display issues