Fix up GUI