Fixed display issues