#20 Fixed display issues