Fix marker issue
Add saving screen
Fix animation ordering and add icon