fix destroy button, some fixes