Fix up GUI and add status display