change history view: show button group as intended
Merge branch 'staging' into develop