Fix user interface quirks