Attempts to fix UI display issues...