Fix minor display issues