Improve cp_button flexibility. Add reorder option.