Add support for adding/removing buttons
Update sorting - Use the field sorting flag if exists, instead of the global sorting flag.