Fixing a various display issues I run into