Clean up add/remove button markup