remove buttons

managed to get the .remove working with cp5 + other tweaks.