cleaned up/replaced some buttons