Fix some UI problems with registration/deregistration