Fixed display errors