#78 save and activate button done