Fixed display minor bugs