Switched to final assets and added some animations