Fix up the user interface