Fixed display issues in GUI