[ADD][TOM-240]Order buttons and client name

Merged Gastón Bertolani requested to merge 15.0-TOM-240-minor-changes into 15.0-stage

Closes TOM-240

Merge request reports