Clean up and delete unneeded code
Support save actions for loading
Use new mechanism when replying
Minor animation fix