Fix close button and mgmt command