Fix minor display logic bugs