Fix #6, fix remove buttons uninstalling