CLSN-827 stakeholder: fix buttons display and save, discuss with suraj