Rework deploy/undeploy UI