fixed the bugs on display