fix a few display bug