Fix little display bugs