Improved saving and editing of action