diff --git a/js/components/preview/Preview.js b/js/components/preview/Preview.js
index be374f61b..a5f890105 100644
--- a/js/components/preview/Preview.js
+++ b/js/components/preview/Preview.js
@@ -91,7 +91,7 @@ const Preview = memo(({ isStateLoaded, hideProjects }) => {
   const dispatch = useDispatch();
 
   const customDatasets = useSelector(state => state.datasetsReducers.datasets);
-  const [selectedDatasetIndex, setSelectedDatasetIndex] = useState();
+  const [selectedDatasetIndex, setSelectedDatasetIndex] = useState(0);
   const currentDataset = customDatasets[selectedDatasetIndex];
   const target_on = useSelector(state => state.apiReducers.target_on);
   const isTrackingRestoring = useSelector(state => state.trackingReducers.isTrackingCompoundsRestoring);
diff --git a/js/components/preview/moleculeGroups/redux/dispatchActions.js b/js/components/preview/moleculeGroups/redux/dispatchActions.js
index d85945b09..7ece4791e 100644
--- a/js/components/preview/moleculeGroups/redux/dispatchActions.js
+++ b/js/components/preview/moleculeGroups/redux/dispatchActions.js
@@ -33,6 +33,7 @@ import { OBJECT_TYPE } from '../../../nglView/constants';
 import { setSortDialogOpen } from '../../molecule/redux/actions';
 import { resetCurrentCompoundsSettings } from '../../compounds/redux/actions';
 import { reloadSession } from '../../../snapshot/redux/dispatchActions';
+import { restoreCurrentActionsList } from '../../../../reducers/tracking/dispatchActions';
 
 export const clearAfterDeselectingMoleculeGroup = ({ molGroupId, currentMolGroup, majorViewStage }) => (
   dispatch,
@@ -246,10 +247,13 @@ export const clearMoleculeGroupSelection = ({ getNglView }) => (dispatch, getSta
 
 export const restoreFromCurrentSnapshot = ({ nglViewList }) => (dispatch, getState) => {
   const snapshot = getState().projectReducers.currentSnapshot.data;
-
   dispatch(reloadSession(snapshot, nglViewList));
 };
 
+export const restoreSnapshotActions = ({ nglViewList }) => (dispatch, getState) => {
+  dispatch(restoreCurrentActionsList(nglViewList));
+};
+
 export const onDeselectMoleculeGroup = ({ moleculeGroup, stageSummaryView, majorViewStage }) => (
   dispatch,
   getState
diff --git a/js/components/preview/redux/dispatchActions.js b/js/components/preview/redux/dispatchActions.js
index 68f3eb46d..ebd038920 100644
--- a/js/components/preview/redux/dispatchActions.js
+++ b/js/components/preview/redux/dispatchActions.js
@@ -78,15 +78,6 @@ export const shouldLoadProtein = ({
         });
     }
 
-    // decide to load existing snapshot
-    else if (
-      currentSnapshotID !== null &&
-      (!routeSnapshotID || routeSnapshotID === currentSnapshotID.toString()) &&
-      currentSnapshotData !== null
-    ) {
-      dispatch(reloadSession(currentSnapshotData, nglViewList));
-    }
-
     if (targetOnName !== undefined) {
       document.title = targetOnName + ': Fragalysis';
     }
diff --git a/js/components/projects/addProjectDetail/index.js b/js/components/projects/addProjectDetail/index.js
index 24706cf3e..b48ed4682 100644
--- a/js/components/projects/addProjectDetail/index.js
+++ b/js/components/projects/addProjectDetail/index.js
@@ -9,6 +9,7 @@ import { Autocomplete } from '@material-ui/lab';
 import { Button } from '../../common/Inputs/Button';
 import { useDispatch, useSelector } from 'react-redux';
 import { createProjectFromSnapshotDialog } from '../redux/dispatchActions';
+import { manageSendTrackingActions } from '../../../reducers/tracking/dispatchActions';
 
 const useStyles = makeStyles(theme => ({
   body: {
@@ -34,6 +35,7 @@ export const AddProjectDetail = memo(({ handleCloseModal }) => {
 
   const dispatch = useDispatch();
   const targetId = useSelector(state => state.apiReducers.target_on);
+  const projectID = useSelector(state => state.projectReducers.currentProject.projectID);
   const isProjectModalLoading = useSelector(state => state.projectReducers.isProjectModalLoading);
 
   const [tags, setTags] = React.useState([]);
@@ -65,11 +67,17 @@ export const AddProjectDetail = memo(({ handleCloseModal }) => {
             author: DJANGO_CONTEXT['pk'] || null,
             tags: JSON.stringify(tags)
           };
-          dispatch(createProjectFromSnapshotDialog(data)).catch(error => {
-            setState(() => {
-              throw error;
+
+          const oldProjectID = projectID;
+          dispatch(createProjectFromSnapshotDialog(data))
+            .then(() => {
+              dispatch(manageSendTrackingActions(oldProjectID, true));
+            })
+            .catch(error => {
+              setState(() => {
+                throw error;
+              });
             });
-          });
         }}
       >
         {({ submitForm, isSubmitting }) => (
diff --git a/js/components/projects/projectPreview/index.js b/js/components/projects/projectPreview/index.js
index 03f07c8a6..844949010 100644
--- a/js/components/projects/projectPreview/index.js
+++ b/js/components/projects/projectPreview/index.js
@@ -5,6 +5,8 @@ import { useRouteMatch } from 'react-router-dom';
 import { loadCurrentSnapshotByID, loadSnapshotByProjectID } from '../redux/dispatchActions';
 import { HeaderContext } from '../../header/headerContext';
 import { DJANGO_CONTEXT } from '../../../utils/djangoContext';
+import { restoreCurrentActionsList, restoreAfterTargetActions } from '../../../reducers/tracking/dispatchActions';
+import { NglContext } from '../../nglView/nglProvider';
 
 export const ProjectPreview = memo(({}) => {
   const { setSnackBarTitle } = useContext(HeaderContext);
@@ -12,10 +14,13 @@ export const ProjectPreview = memo(({}) => {
   const isSnapshotLoaded = useRef(undefined);
   let match = useRouteMatch();
   const dispatch = useDispatch();
+  const { nglViewList } = useContext(NglContext);
+
   const projectId = match && match.params && match.params.projectId;
   const snapshotId = match && match.params && match.params.snapshotId;
   const currentSnapshotID = useSelector(state => state.projectReducers.currentSnapshot.id);
   const currentProject = useSelector(state => state.projectReducers.currentProject);
+  const isActionRestoring = useSelector(state => state.trackingReducers.isActionRestoring);
 
   useEffect(() => {
     if (!snapshotId && currentSnapshotID === null) {
@@ -31,28 +36,36 @@ export const ProjectPreview = memo(({}) => {
           throw new Error(error);
         });
     } else {
-      dispatch(loadCurrentSnapshotByID(snapshotId || currentSnapshotID))
-        .then(response => {
-          if (response !== false) {
-            if (response) {
-              if (response.session_project && `${response.session_project.id}` === projectId) {
-                isSnapshotLoaded.current = response.id;
-                setCanShow(true);
+      if (currentSnapshotID === null) {
+        dispatch(loadCurrentSnapshotByID(snapshotId))
+          .then(response => {
+            if (response !== false) {
+              if (response) {
+                if (response.session_project && `${response.session_project.id}` === projectId) {
+                  isSnapshotLoaded.current = response.id;
+                  setCanShow(true);
+                } else {
+                  setCanShow(false);
+                }
               } else {
+                isSnapshotLoaded.current = response;
                 setCanShow(false);
               }
-            } else {
-              isSnapshotLoaded.current = response;
-              setCanShow(false);
             }
-          }
-        })
-        .catch(error => {
-          setCanShow(false);
-          throw new Error(error);
-        });
+          })
+          .catch(error => {
+            setCanShow(false);
+            throw new Error(error);
+          });
+      } else {
+        if (isActionRestoring === false) {
+          dispatch(restoreCurrentActionsList(nglViewList));
+        } else if (nglViewList && nglViewList.length > 0) {
+          dispatch(restoreAfterTargetActions(nglViewList));
+        }
+      }
     }
-  }, [currentSnapshotID, dispatch, projectId, snapshotId]);
+  }, [currentSnapshotID, dispatch, projectId, snapshotId, isActionRestoring, nglViewList, canShow]);
 
   if (canShow === false) {
     setSnackBarTitle('Not valid snapshot!');
diff --git a/js/components/projects/redux/dispatchActions.js b/js/components/projects/redux/dispatchActions.js
index 12afa6586..d79067025 100644
--- a/js/components/projects/redux/dispatchActions.js
+++ b/js/components/projects/redux/dispatchActions.js
@@ -38,7 +38,7 @@ export const assignSnapshotToProject = ({ projectID, snapshotID, ...rest }) => (
           created: response.data.created,
           children: response.data.children,
           parent: response.data.parent,
-          data: JSON.parse(response.data.data)
+          data: '[]'
         })
       )
     )
@@ -147,7 +147,7 @@ export const loadSnapshotByProjectID = projectID => (dispatch, getState) => {
               created: response.data.results[0].created,
               children: response.data.results[0].children,
               parent: response.data.results[0].parent,
-              data: JSON.parse(response.data.results[0].data)
+              data: '[]'
             })
           );
           return Promise.resolve(response.data.results[0].id);
@@ -184,7 +184,7 @@ export const loadCurrentSnapshotByID = snapshotID => (dispatch, getState) => {
               created: response.data.created,
               children: response.data.children,
               parent: response.data.parent,
-              data: JSON.parse(response.data.data)
+              data: '[]'
             })
           );
           return Promise.resolve(response.data);
@@ -294,7 +294,7 @@ const copySnapshot = (selectedSnapshot, projectID, history) => dispatch => {
       title: selectedSnapshot.title,
       author: (selectedSnapshot && selectedSnapshot.author && selectedSnapshot.author.id) || null,
       description: selectedSnapshot.description,
-      data: JSON.parse(selectedSnapshot.data),
+      data: '[]',
       created: selectedSnapshot.created,
       parent: null,
       children: selectedSnapshot.children,
diff --git a/js/components/snapshot/redux/dispatchActions.js b/js/components/snapshot/redux/dispatchActions.js
index 8d5e9d123..6d5d22b56 100644
--- a/js/components/snapshot/redux/dispatchActions.js
+++ b/js/components/snapshot/redux/dispatchActions.js
@@ -25,10 +25,8 @@ import { base_url, URLS } from '../../routes/constants';
 import { resetCurrentSnapshot, setCurrentSnapshot, setForceCreateProject } from '../../projects/redux/actions';
 import { selectFirstMolGroup } from '../../preview/moleculeGroups/redux/dispatchActions';
 import { reloadDatasetsReducer } from '../../datasets/redux/actions';
-import {
-  sendTruckingActionsByProjectId,
-  appendAndSendTruckingActions
-} from '../../../reducers/tracking/dispatchActions';
+import { saveCurrentActionsList } from '../../../reducers/tracking/dispatchActions';
+import { sendTrackingActionsByProjectId, manageSendTrackingActions } from '../../../reducers/tracking/dispatchActions';
 
 export const getListOfSnapshots = () => (dispatch, getState) => {
   const userID = DJANGO_CONTEXT['pk'] || null;
@@ -86,7 +84,7 @@ export const saveCurrentSnapshot = ({
   dispatch(resetCurrentSnapshot());
   return api({
     url: `${base_url}/api/snapshots/`,
-    data: { type, title, author, description, data: JSON.stringify(data), created, parent, children, session_project },
+    data: { type, title, author, description, created, parent, data: '[]', children, session_project },
     method: METHOD.POST
   })
     .then(response =>
@@ -185,8 +183,6 @@ export const createNewSnapshot = ({ title, description, type, author, parent, se
   getState
 ) => {
   const state = getState();
-  const { apiReducers, nglReducers, selectionReducers, previewReducers, datasetsReducers } = state;
-  const data = { apiReducers, nglReducers, selectionReducers, previewReducers, datasetsReducers };
   const selectedSnapshotToSwitch = state.snapshotReducers.selectedSnapshotToSwitch;
   const disableRedirect = state.snapshotReducers.disableRedirect;
 
@@ -212,13 +208,15 @@ export const createNewSnapshot = ({ title, description, type, author, parent, se
           author,
           parent,
           session_project,
-          data: JSON.stringify(data),
+          data: '[]',
           children: []
         },
         method: METHOD.POST
       }).then(res => {
         // redirect to project with newest created snapshot /:projectID/:snapshotID
         if (res.data.id && session_project) {
+          dispatch(saveCurrentActionsList(res.data.id, session_project));
+
           if (disableRedirect === false) {
             // Really bad usage or redirection. Hint for everybody in this line ignore it, but in other parts of code
             // use react-router !
@@ -253,6 +251,7 @@ export const activateSnapshotDialog = (loggedInUserID = undefined, finallyShareS
   const projectID = state.projectReducers.currentProject.projectID;
   const currentSnapshotAuthor = state.projectReducers.currentSnapshot.author;
 
+  dispatch(manageSendTrackingActions());
   dispatch(setDisableRedirect(finallyShareSnapshot));
 
   if (!loggedInUserID && targetId) {
@@ -265,7 +264,7 @@ export const activateSnapshotDialog = (loggedInUserID = undefined, finallyShareS
     };
     dispatch(createProjectFromSnapshotDialog(data))
       .then(() => {
-        dispatch(appendAndSendTruckingActions(null));
+        dispatch(manageSendTrackingActions(projectID, true));
         dispatch(setOpenSnapshotSavingDialog(true));
       })
       .catch(error => {
@@ -287,10 +286,6 @@ export const createNewSnapshotWithoutStateModification = ({
   parent,
   session_project
 }) => (dispatch, getState) => {
-  const state = getState();
-  const { apiReducers, nglReducers, selectionReducers, previewReducers, datasetsReducers } = state;
-  const data = { apiReducers, nglReducers, selectionReducers, previewReducers, datasetsReducers };
-
   if (!session_project) {
     return Promise.reject('Project ID is missing!');
   }
@@ -311,7 +306,7 @@ export const createNewSnapshotWithoutStateModification = ({
         author,
         parent,
         session_project,
-        data: JSON.stringify(data),
+        data: '[]',
         children: []
       },
       method: METHOD.POST
@@ -325,6 +320,7 @@ export const createNewSnapshotWithoutStateModification = ({
             disableRedirect: true
           })
         );
+        dispatch(saveCurrentActionsList(res.data.id, session_project));
       }
     });
   });
@@ -358,7 +354,7 @@ export const saveAndShareSnapshot = (target = undefined) => (dispatch, getState)
         const parent = null;
         const session_project = projectID;
 
-        dispatch(sendTruckingActionsByProjectId(projectID, author));
+        dispatch(sendTrackingActionsByProjectId(projectID, author));
 
         return dispatch(
           createNewSnapshotWithoutStateModification({ title, description, type, author, parent, session_project })
diff --git a/js/components/snapshot/withSnapshotManagement.js b/js/components/snapshot/withSnapshotManagement.js
index 4bd6eafac..7c8b0b662 100644
--- a/js/components/snapshot/withSnapshotManagement.js
+++ b/js/components/snapshot/withSnapshotManagement.js
@@ -9,7 +9,7 @@ import { DJANGO_CONTEXT } from '../../utils/djangoContext';
 import { useDisableUserInteraction } from '../helpers/useEnableUserInteracion';
 import { activateSnapshotDialog, saveAndShareSnapshot } from './redux/dispatchActions';
 import { NglContext } from '../nglView/nglProvider';
-import { restoreFromCurrentSnapshot } from '../preview/moleculeGroups/redux/dispatchActions';
+import { restoreSnapshotActions } from '../preview/moleculeGroups/redux/dispatchActions';
 
 /**
  * Created by ricgillams on 13/06/2018.
@@ -64,7 +64,7 @@ export const withSnapshotManagement = WrappedComponent => {
           <Button
             key="restoreSnapshot"
             color="primary"
-            onClick={() => dispatch(restoreFromCurrentSnapshot({ nglViewList }))}
+            onClick={() => dispatch(restoreSnapshotActions({ nglViewList }))}
             startIcon={<Restore />}
             disabled={disableShareButton || disableUserInteraction}
           >
diff --git a/js/components/target/redux/dispatchActions.js b/js/components/target/redux/dispatchActions.js
index 52c1a7b94..3bd547e39 100644
--- a/js/components/target/redux/dispatchActions.js
+++ b/js/components/target/redux/dispatchActions.js
@@ -30,7 +30,9 @@ export const loadTargetList = onCancel => (dispatch, getState) => {
   });
 };
 
-export const updateTarget = ({ target, setIsLoading, targetIdList, projectId }) => dispatch => {
+export const updateTarget = ({ target, setIsLoading, targetIdList, projectId }) => (dispatch, getState) => {
+  const isActionRestoring = getState().trackingReducers.isActionRestoring;
+
   // Get from the REST API
   let targetUnrecognisedFlag = true;
   if (target !== undefined) {
@@ -63,8 +65,11 @@ export const updateTarget = ({ target, setIsLoading, targetIdList, projectId })
       setIsLoading(true);
       return api({ url: `${base_url}/api/session-projects/${projectId}/` })
         .then(response => {
-          return Promise.all([
-            dispatch(setTargetOn(response.data.target.id)),
+          let promises = [];
+          if (!isActionRestoring || isActionRestoring === false) {
+            promises.push(dispatch(setTargetOn(response.data.target.id, true)));
+          }
+          promises.push(
             dispatch(
               setCurrentProject({
                 projectID: response.data.id,
@@ -75,7 +80,8 @@ export const updateTarget = ({ target, setIsLoading, targetIdList, projectId })
                 tags: JSON.parse(response.data.tags)
               })
             )
-          ]);
+          );
+          return Promise.all(promises);
         })
         .finally(() => setIsLoading(false));
     }
diff --git a/js/components/target/withUpdatingTarget.js b/js/components/target/withUpdatingTarget.js
index 312303ba1..fcecead88 100644
--- a/js/components/target/withUpdatingTarget.js
+++ b/js/components/target/withUpdatingTarget.js
@@ -13,6 +13,7 @@ export const withUpdatingTarget = WrappedContainer => {
       const target = match && match.params && match.params.target;
       const uuid = match && match.params && match.params.uuid;
       const snapshotUuid = match && match.params && match.params.snapshotUuid;
+      const snapshotId = match && match.params && match.params.snapshotId;
       const projectId = match && match.params && match.params.projectId;
 
       const { isLoading, setIsLoading } = useContext(HeaderContext);
@@ -32,7 +33,7 @@ export const withUpdatingTarget = WrappedContainer => {
             throw error;
           });
         });
-      }, [setIsLoading, target, updateTarget, targetIdList, projectId]);
+      }, [setIsLoading, target, updateTarget, targetIdList, projectId, snapshotId]);
 
       if (isLoading === true) {
         return null;
diff --git a/js/components/tracking/trackingModal.js b/js/components/tracking/trackingModal.js
index 13a6be0e2..d47761e84 100644
--- a/js/components/tracking/trackingModal.js
+++ b/js/components/tracking/trackingModal.js
@@ -1,17 +1,12 @@
-import React, { memo, useContext, useCallback, useEffect } from 'react';
+import React, { memo, useCallback, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import Modal from '../common/Modal';
 import { Grid, makeStyles, IconButton, Tooltip } from '@material-ui/core';
 import { Timeline, TimelineEvent } from 'react-event-timeline';
-import { Check, Clear, Save, Restore, Close } from '@material-ui/icons';
+import { Check, Clear, Close } from '@material-ui/icons';
 import palette from '../../theme/palette';
 import { Panel } from '../common';
-import {
-  selectCurrentActionsList,
-  restoreCurrentActionsList,
-  setProjectTruckingActions
-} from '../../reducers/tracking/dispatchActions';
-import { NglContext } from '../nglView/nglProvider';
+import { setProjectTrackingActions } from '../../reducers/tracking/dispatchActions';
 
 const useStyles = makeStyles(theme => ({
   customModal: {
@@ -41,14 +36,13 @@ const useStyles = makeStyles(theme => ({
 export const TrackingModal = memo(({ openModal, onModalClose }) => {
   const classes = useStyles();
   const dispatch = useDispatch();
-  const { nglViewList } = useContext(NglContext);
 
   const actionList = useSelector(state => state.trackingReducers.project_actions_list);
   const orderedActionList = (actionList && actionList.sort((a, b) => a.timestamp - b.timestamp)) || [];
 
   const loadAllActions = useCallback(() => {
     if (openModal === true) {
-      dispatch(setProjectTruckingActions());
+      dispatch(setProjectTrackingActions());
     }
   }, [dispatch, openModal]);
 
@@ -62,16 +56,6 @@ export const TrackingModal = memo(({ openModal, onModalClose }) => {
   }
 
   const actions = [
-    <IconButton color={'inherit'} onClick={() => dispatch(selectCurrentActionsList())}>
-      <Tooltip title="Save">
-        <Save />
-      </Tooltip>
-    </IconButton>,
-    <IconButton color={'inherit'} onClick={() => dispatch(restoreCurrentActionsList(nglViewList))}>
-      <Tooltip title="Restore">
-        <Restore />
-      </Tooltip>
-    </IconButton>,
     <IconButton color={'inherit'} onClick={() => onModalClose()}>
       <Tooltip title="Close">
         <Close />
diff --git a/js/constants/constants.js b/js/constants/constants.js
index 899cf7fb8..afd9e0200 100644
--- a/js/constants/constants.js
+++ b/js/constants/constants.js
@@ -1,11 +1,11 @@
 const main_identifier = 'x';
 const sub_identifier = '_';
-const count_send_truck_actions = 5;
+const count_send_track_actions = 5;
 
 export const CONSTANTS = {
   MAIN_IDENTIFIER: main_identifier,
   SUB_IDENTIFIER: sub_identifier,
-  COUNT_SEND_TRUCK_ACTIONS: count_send_truck_actions
+  COUNT_SEND_TRACK_ACTIONS: count_send_track_actions
 };
 
 export const VIEWS = {
diff --git a/js/reducers/api/actions.js b/js/reducers/api/actions.js
index 204589282..925e9b56a 100644
--- a/js/reducers/api/actions.js
+++ b/js/reducers/api/actions.js
@@ -17,10 +17,11 @@ export const setDuckYankData = function(input_json) {
   };
 };
 
-export const setTargetOn = function(target_id) {
+export const setTargetOn = function(target_id, skipTracking = false) {
   return {
     type: constants.SET_TARGET_ON,
-    target_on: target_id
+    target_on: target_id,
+    skipTracking: skipTracking
   };
 };
 
@@ -156,14 +157,14 @@ export const setUuid = function(uuid) {
   };
 };
 
-export const setDirectAccess = (directAccessParams) => {
+export const setDirectAccess = directAccessParams => {
   return {
     type: constants.SET_DIRECT_ACCESS,
     direct_access: directAccessParams
   };
 };
 
-export const setDirectAccessProcessed = (directAccessProcessedParams) => {
+export const setDirectAccessProcessed = directAccessProcessedParams => {
   return {
     type: constants.SET_DIRECT_ACCESS_PROCESSED,
     direct_access_processed: directAccessProcessedParams
diff --git a/js/reducers/tracking/actions.js b/js/reducers/tracking/actions.js
index 587bb77c1..1521f7dc1 100644
--- a/js/reducers/tracking/actions.js
+++ b/js/reducers/tracking/actions.js
@@ -1,16 +1,16 @@
 import { constants } from './constants';
 
-export const setActionsList = function(truck_actions_list) {
+export const setActionsList = function(track_actions_list) {
   return {
     type: constants.SET_ACTIONS_LIST,
-    truck_actions_list: truck_actions_list
+    track_actions_list: track_actions_list
   };
 };
 
-export const appendToActionList = function(truck_action) {
+export const appendToActionList = function(track_action) {
   return {
     type: constants.APPEND_ACTIONS_LIST,
-    truck_action: truck_action
+    track_action: track_action
   };
 };
 
@@ -56,17 +56,17 @@ export const setIsActionsLoading = function(isActionsLoading) {
   };
 };
 
-export const setSendActionsList = function(truck_actions_list) {
+export const setSendActionsList = function(track_actions_list) {
   return {
     type: constants.SET_SEND_ACTIONS_LIST,
-    send_actions_list: truck_actions_list
+    send_actions_list: track_actions_list
   };
 };
 
-export const appendToSendActionList = function(truck_action) {
+export const appendToSendActionList = function(track_action) {
   return {
     type: constants.APPEND_SEND_ACTIONS_LIST,
-    truck_action: truck_action
+    track_action: track_action
   };
 };
 
@@ -76,3 +76,17 @@ export const setProjectActionList = function(project_actions_list) {
     project_actions_list: project_actions_list
   };
 };
+
+export const setIsActionsSaving = function(isActionSaving) {
+  return {
+    type: constants.SET_IS_ACTIONS_SAVING,
+    isActionSaving: isActionSaving
+  };
+};
+
+export const setIsActionsRestoring = function(isActionRestoring) {
+  return {
+    type: constants.SET_IS_ACTIONS_RESTORING,
+    isActionRestoring: isActionRestoring
+  };
+};
diff --git a/js/reducers/tracking/constants.js b/js/reducers/tracking/constants.js
index ad927cbf9..c6d3740d8 100644
--- a/js/reducers/tracking/constants.js
+++ b/js/reducers/tracking/constants.js
@@ -11,7 +11,9 @@ export const constants = {
   APPEND_SEND_ACTIONS_LIST: prefix + 'APPEND_SEND_ACTIONS_LIST',
   SET_IS_ACTIONS_SENDING: prefix + 'SET_IS_ACTIONS_SENDING',
   SET_IS_ACTIONS_LOADING: prefix + 'SET_IS_ACTIONS_LOADING',
-  SET_PROJECT_ACTIONS_LIST: prefix + 'SET_PROJECT_ACTIONS_LIST'
+  SET_PROJECT_ACTIONS_LIST: prefix + 'SET_PROJECT_ACTIONS_LIST',
+  SET_IS_ACTIONS_SAVING: prefix + 'SET_IS_ACTIONS_SAVING',
+  SET_IS_ACTIONS_RESTORING: prefix + 'SET_IS_ACTIONS_RESTORING'
 };
 
 export const actionType = {
diff --git a/js/reducers/tracking/dispatchActions.js b/js/reducers/tracking/dispatchActions.js
index 41feca1fe..b81ce8ebc 100644
--- a/js/reducers/tracking/dispatchActions.js
+++ b/js/reducers/tracking/dispatchActions.js
@@ -59,7 +59,13 @@ import { api, METHOD } from '../../../js/utils/api';
 import { base_url } from '../../components/routes/constants';
 import { CONSTANTS } from '../../../js/constants/constants';
 import moment from 'moment';
-import { appendToActionList, appendToSendActionList, setProjectActionList } from './actions';
+import {
+  appendToActionList,
+  appendToSendActionList,
+  setProjectActionList,
+  setIsActionsSaving,
+  setIsActionsRestoring
+} from './actions';
 import {
   setSelectedAll,
   setDeselectedAll,
@@ -73,10 +79,24 @@ import {
   setDeselectedAllByType as setDeselectedAllByTypeOfDataset
 } from '../../components/datasets/redux/actions';
 
-export const selectCurrentActionsList = () => (dispatch, getState) => {
+export const saveCurrentActionsList = (snapshotID, projectID) => (dispatch, getState) => {
+  const state = getState();
+
+  let actionList = state.trackingReducers.track_actions_list;
+
+  if (!actionList || actionList.length === 0) {
+    Promise.resolve(dispatch(getTrackingActions(projectID))).then(response => {
+      actionList = response;
+      dispatch(saveActionsList(snapshotID, actionList));
+    });
+  } else {
+    dispatch(saveActionsList(snapshotID, actionList));
+  }
+};
+
+export const saveActionsList = (snapshotID, actionList) => (dispatch, getState) => {
   const state = getState();
 
-  const actionList = state.trackingReducers.truck_actions_list;
   const currentTargetOn = state.apiReducers.target_on;
   const currentSites = state.selectionReducers.mol_group_selection;
   const currentLigands = state.selectionReducers.fragmentDisplayList;
@@ -95,10 +115,11 @@ export const selectCurrentActionsList = () => (dispatch, getState) => {
   const currentDatasetBuyList = state.datasetsReducers.compoundsToBuyDatasetMap;
   const currentobjectsInView = state.nglReducers.objectsInView;
 
-  const orderedActionList = actionList.reverse((a, b) => a.timestamp - b.timestamp);
   const currentTargets = (currentTargetOn && [currentTargetOn]) || [];
   const currentVectorSmiles = (currentVector && [currentVector]) || [];
 
+  let orderedActionList = actionList.reverse((a, b) => a.timestamp - b.timestamp);
+
   let currentActions = [];
 
   getCurrentActionList(orderedActionList, actionType.TARGET_LOADED, getCollection(currentTargets), currentActions);
@@ -173,6 +194,41 @@ export const selectCurrentActionsList = () => (dispatch, getState) => {
   );
 
   dispatch(setCurrentActionsList(currentActions));
+  dispatch(saveTrackingActions(currentActions, snapshotID));
+};
+
+const saveTrackingActions = (currentActions, snapshotID) => (dispatch, getState) => {
+  const state = getState();
+  const project = state.projectReducers.currentProject;
+  const projectID = project && project.projectID;
+
+  if (snapshotID) {
+    dispatch(setIsActionsSaving(true));
+
+    const dataToSend = {
+      session_project: projectID,
+      author: project.authorID,
+      snapshot: snapshotID,
+      last_update_date: moment().format(),
+      actions: JSON.stringify(currentActions)
+    };
+    return api({
+      url: `${base_url}/api/snapshot-actions/`,
+      method: METHOD.POST,
+      data: JSON.stringify(dataToSend)
+    })
+      .then(response => {
+        dispatch(setCurrentActionsList([]));
+      })
+      .catch(error => {
+        throw new Error(error);
+      })
+      .finally(() => {
+        dispatch(setIsActionsSaving(false));
+      });
+  } else {
+    return Promise.resolve();
+  }
 };
 
 const getCurrentActionList = (orderedActionList, type, collection, currentActions) => {
@@ -190,22 +246,12 @@ const getCurrentActionList = (orderedActionList, type, collection, currentAction
       let action = actionList.find(action => action.object_id === data.id && action.dataset_id === data.datasetId);
 
       if (action) {
-        currentActions.push(Object.assign(mapCurrentAction(action)));
+        currentActions.push(Object.assign({ ...action }));
       }
     });
   }
 };
 
-const mapCurrentAction = action => {
-  return Object.assign({
-    timestamp: action.timestamp,
-    object_name: action.object_name,
-    object_type: action.object_type,
-    action_type: action.type,
-    dataset_id: action.dataset_id
-  });
-};
-
 const getCollection = dataList => {
   let list = [];
   if (dataList) {
@@ -257,11 +303,43 @@ const getCollectionOfDatasetOfRepresentation = dataList => {
 };
 
 export const restoreCurrentActionsList = (stages = []) => (dispatch, getState) => {
-  dispatch(setIsTrackingMoleculesRestoring(true));
-  dispatch(setIsTrackingCompoundsRestoring(true));
-  dispatch(unmountPreviewComponent(stages));
-  dispatch(resetTargetState());
-  dispatch(restoreStateBySavedActionList(stages));
+  dispatch(setIsActionsRestoring(true));
+
+  Promise.resolve(dispatch(restoreTrackingActions())).then(response => {
+    dispatch(setIsTrackingMoleculesRestoring(true));
+    dispatch(setIsTrackingCompoundsRestoring(true));
+    dispatch(unmountPreviewComponent(stages));
+    dispatch(resetTargetState());
+    dispatch(restoreStateBySavedActionList(stages));
+  });
+};
+
+const restoreTrackingActions = () => (dispatch, getState) => {
+  const state = getState();
+  const snapshot = state.projectReducers.currentSnapshot;
+  const snapshotID = snapshot && snapshot.id;
+
+  if (snapshotID) {
+    return api({
+      url: `${base_url}/api/snapshot-actions/?snapshot=${snapshotID}`
+    })
+      .then(response => {
+        let results = response.data.results;
+        let listToSet = [];
+        results.forEach(r => {
+          let resultActions = JSON.parse(r.actions);
+          listToSet.push(...resultActions);
+        });
+
+        let snapshotActions = [...listToSet];
+        dispatch(setCurrentActionsList(snapshotActions));
+      })
+      .catch(error => {
+        throw new Error(error);
+      });
+  } else {
+    return Promise.resolve();
+  }
 };
 
 const restoreStateBySavedActionList = stages => (dispatch, getState) => {
@@ -276,34 +354,45 @@ const restoreStateBySavedActionList = stages => (dispatch, getState) => {
 const restoreTargetActions = (orderedActionList, stages) => (dispatch, getState) => {
   const state = getState();
 
-  const majorView = stages.find(view => view.id === VIEWS.MAJOR_VIEW);
-  const summaryView = stages.find(view => view.id === VIEWS.SUMMARY_VIEW);
-
-  let targetAction = orderedActionList.find(action => action.action_type === actionType.TARGET_LOADED);
+  let targetAction = orderedActionList.find(action => action.type === actionType.TARGET_LOADED);
   if (targetAction) {
     let target = getTarget(targetAction.object_name, state);
     if (target) {
       dispatch(setTargetOn(target.id));
-      dispatch(shouldLoadProtein({ nglViewList: stages, currentSnapshotID: null, isLoadingCurrentSnapshot: false }));
+    }
+  }
+};
 
-      dispatch(
-        loadMoleculeGroupsOfTarget({
-          summaryView: summaryView.stage,
-          isStateLoaded: false,
-          setOldUrl: url => {},
-          target_on: target.id
-        })
-      )
-        .catch(error => {
-          throw error;
-        })
-        .finally(() => {
-          dispatch(restoreSitesActions(orderedActionList, summaryView));
-          dispatch(loadAllMolecules(orderedActionList, target.id, majorView.stage));
-        });
+export const restoreAfterTargetActions = stages => (dispatch, getState) => {
+  const state = getState();
 
-      dispatch(loadAllDatasets(orderedActionList, target.id, majorView.stage));
-    }
+  const currentActionList = state.trackingReducers.current_actions_list;
+  const orderedActionList = currentActionList.sort((a, b) => a.timestamp - b.timestamp);
+  const targetId = state.apiReducers.target_on;
+
+  if (targetId && stages && stages.length > 0) {
+    const majorView = stages.find(view => view.id === VIEWS.MAJOR_VIEW);
+    const summaryView = stages.find(view => view.id === VIEWS.SUMMARY_VIEW);
+
+    dispatch(shouldLoadProtein({ nglViewList: stages, currentSnapshotID: null, isLoadingCurrentSnapshot: false }));
+
+    dispatch(
+      loadMoleculeGroupsOfTarget({
+        summaryView: summaryView.stage,
+        isStateLoaded: false,
+        setOldUrl: url => {},
+        target_on: targetId
+      })
+    )
+      .catch(error => {
+        throw error;
+      })
+      .finally(() => {
+        dispatch(restoreSitesActions(orderedActionList, summaryView));
+        dispatch(loadAllMolecules(orderedActionList, targetId, majorView.stage));
+        dispatch(loadAllDatasets(orderedActionList, targetId, majorView.stage));
+        dispatch(restoreRepresentationActions(orderedActionList, stages));
+      });
   }
 };
 
@@ -356,7 +445,7 @@ const loadAllMolecules = (orderedActionList, target_on, stage) => (dispatch, get
 const restoreSitesActions = (orderedActionList, summaryView) => (dispatch, getState) => {
   const state = getState();
 
-  let sitesAction = orderedActionList.filter(action => action.action_type === actionType.SITE_TURNED_ON);
+  let sitesAction = orderedActionList.filter(action => action.type === actionType.SITE_TURNED_ON);
   if (sitesAction) {
     sitesAction.forEach(action => {
       let molGroup = getMolGroup(action.object_name, state);
@@ -381,10 +470,44 @@ const restoreMoleculesActions = (orderedActionList, stage) => (dispatch, getStat
     dispatch(addNewType(moleculesAction, actionType.VECTOR_SELECTED, 'vector', stage, state));
   }
 
-  let vectorAction = orderedActionList.find(action => action.action_type === actionType.VECTOR_SELECTED);
+  let vectorAction = orderedActionList.find(action => action.type === actionType.VECTOR_SELECTED);
   if (vectorAction) {
     dispatch(setCurrentVector(vectorAction.object_name));
   }
+
+  dispatch(restoreCartActions(moleculesAction));
+};
+
+const restoreCartActions = moleculesAction => (dispatch, getState) => {
+  let shoppingCartActions = moleculesAction.filter(
+    action => action.type === actionType.MOLECULE_ADDED_TO_SHOPPING_CART
+  );
+  if (shoppingCartActions) {
+    shoppingCartActions.forEach(action => {
+      let data = action.item;
+      if (data) {
+        dispatch(appendToBuyList(data));
+      }
+    });
+  }
+};
+
+const restoreRepresentationActions = (moleculesAction, stages) => (dispatch, getState) => {
+  const nglView = stages.find(view => view.id === VIEWS.MAJOR_VIEW);
+
+  let representationsActions = moleculesAction.filter(action => action.type === actionType.REPRESENTATION_ADDED);
+  if (representationsActions) {
+    representationsActions.forEach(action => {
+      dispatch(addRepresentation(action.object_id, action.representation, nglView));
+    });
+  }
+
+  let representationsChangesActions = moleculesAction.filter(action => action.type === actionType.REPRESENTATION_ADDED);
+  if (representationsChangesActions) {
+    representationsChangesActions.forEach(action => {
+      dispatch(changeRepresentation(true, action.change, action.object_id, action.representation, nglView));
+    });
+  }
 };
 
 const restoreCompoundsActions = (orderedActionList, stage) => (dispatch, getState) => {
@@ -402,7 +525,7 @@ const restoreCompoundsActions = (orderedActionList, stage) => (dispatch, getStat
     dispatch(addNewTypeCompound(compoundsAction, actionType.SURFACE_TURNED_ON, 'surface', stage, state));
   }
 
-  let compoundsSelectedAction = compoundsAction.filter(action => action.action_type === actionType.COMPOUND_SELECTED);
+  let compoundsSelectedAction = compoundsAction.filter(action => action.type === actionType.COMPOUND_SELECTED);
 
   compoundsSelectedAction.forEach(action => {
     let data = getCompound(action, state);
@@ -428,7 +551,7 @@ const addTypeCompound = {
 };
 
 const addNewType = (moleculesAction, actionType, type, stage, state, skipTracking = false) => dispatch => {
-  let actions = moleculesAction.filter(action => action.action_type === actionType);
+  let actions = moleculesAction.filter(action => action.type === actionType);
   if (actions) {
     actions.forEach(action => {
       let data = getMolecule(action.object_name, state);
@@ -457,7 +580,7 @@ const addNewTypeOfAction = (action, type, stage, state, skipTracking = false) =>
 };
 
 const addNewTypeCompound = (moleculesAction, actionType, type, stage, state, skipTracking = false) => dispatch => {
-  let actions = moleculesAction.filter(action => action.action_type === actionType);
+  let actions = moleculesAction.filter(action => action.type === actionType);
   if (actions) {
     actions.forEach(action => {
       let data = getCompound(action, state);
@@ -532,9 +655,9 @@ export const undoAction = (stages = []) => (dispatch, getState) => {
   const actionUndoList = state.undoableTrackingReducers.future;
   let actions = actionUndoList && actionUndoList[0];
   if (actions) {
-    let actionsLenght = actions.truck_actions_list.length;
+    let actionsLenght = actions.track_actions_list.length;
     actionsLenght = actionsLenght > 0 ? actionsLenght - 1 : actionsLenght;
-    action = actions.truck_actions_list[actionsLenght];
+    action = actions.track_actions_list[actionsLenght];
 
     Promise.resolve(dispatch(handleUndoAction(action, stages))).then(() => {
       dispatch(setIsUndoRedoAction(false));
@@ -550,9 +673,9 @@ export const redoAction = (stages = []) => (dispatch, getState) => {
 
   const actions = state.undoableTrackingReducers.present;
   if (actions) {
-    let actionsLenght = actions.truck_actions_list.length;
+    let actionsLenght = actions.track_actions_list.length;
     actionsLenght = actionsLenght > 0 ? actionsLenght - 1 : actionsLenght;
-    action = actions.truck_actions_list[actionsLenght];
+    action = actions.track_actions_list[actionsLenght];
 
     Promise.resolve(dispatch(dispatch(handleRedoAction(action, stages)))).then(() => {
       dispatch(setIsUndoRedoAction(false));
@@ -1044,34 +1167,35 @@ export const getCanRedo = () => (dispatch, getState) => {
   return state.undoableTrackingReducers.future.length > 0;
 };
 
-export const appendAndSendTruckingActions = truckAction => (dispatch, getState) => {
-  const state = getState();
-  const currentProject = state.projectReducers.currentProject;
-  const sendActions = state.trackingReducers.send_actions_list;
+export const appendAndSendTrackingActions = trackAction => (dispatch, getState) => {
+  if (trackAction && trackAction !== null) {
+    dispatch(appendToActionList(trackAction));
+    dispatch(appendToSendActionList(trackAction));
+  }
 
-  Promise.resolve(dispatch(checkActionsProject(sendActions, currentProject))).then(response => {
-    if (truckAction) {
-      dispatch(appendToActionList(truckAction));
-      dispatch(appendToSendActionList(truckAction));
-    }
-    if (response === true) {
-      dispatch(checkSendTruckingActions());
-    }
-  });
+  dispatch(checkSendTrackingActions());
 };
 
-export const checkSendTruckingActions = () => (dispatch, getState) => {
+export const manageSendTrackingActions = (projectID, copy) => (dispatch, getState) => {
+  if (copy) {
+    dispatch(checkActionsProject(projectID));
+  } else {
+    dispatch(checkSendTrackingActions(true));
+  }
+};
+
+export const checkSendTrackingActions = (save = false) => (dispatch, getState) => {
   const state = getState();
   const currentProject = state.projectReducers.currentProject;
   const sendActions = state.trackingReducers.send_actions_list;
   const length = sendActions.length;
 
-  if (length >= CONSTANTS.COUNT_SEND_TRUCK_ACTIONS) {
-    dispatch(sendTruckingActions(sendActions, currentProject));
+  if (length >= CONSTANTS.COUNT_SEND_TRACK_ACTIONS || save) {
+    dispatch(sendTrackingActions(sendActions, currentProject));
   }
 };
 
-const sendTruckingActions = (sendActions, project) => (dispatch, getState) => {
+const sendTrackingActions = (sendActions, project) => (dispatch, getState) => {
   if (project) {
     const projectID = project && project.projectID;
 
@@ -1106,15 +1230,15 @@ const sendTruckingActions = (sendActions, project) => (dispatch, getState) => {
   }
 };
 
-export const setProjectTruckingActions = () => (dispatch, getState) => {
+export const setProjectTrackingActions = () => (dispatch, getState) => {
   const state = getState();
   const currentProject = state.projectReducers.currentProject;
   const projectID = currentProject && currentProject.projectID;
 
-  dispatch(getTruckingActions(projectID));
+  dispatch(getTrackingActions(projectID));
 };
 
-const getTruckingActions = projectID => (dispatch, getState) => {
+const getTrackingActions = projectID => (dispatch, getState) => {
   const state = getState();
   const sendActions = state.trackingReducers.send_actions_list;
 
@@ -1133,6 +1257,7 @@ const getTruckingActions = projectID => (dispatch, getState) => {
 
         let projectActions = [...listToSet, ...sendActions];
         dispatch(setProjectActionList(projectActions));
+        return Promise.resolve(projectActions);
       })
       .catch(error => {
         throw new Error(error);
@@ -1143,53 +1268,46 @@ const getTruckingActions = projectID => (dispatch, getState) => {
   } else {
     let projectActions = [...sendActions];
     dispatch(setProjectActionList(projectActions));
-    return Promise.resolve();
+    return Promise.resolve(projectActions);
   }
 };
 
-const checkActionsProject = (actions, currentProject) => (dispatch, getState) => {
+const checkActionsProject = projectID => (dispatch, getState) => {
   const state = getState();
-  const currentProjectID = currentProject && currentProject.projectID;
-  const actionList = state.trackingReducers.truck_actions_list;
+  const currentProject = state.projectReducers.currentProject;
+
+  Promise.resolve(dispatch(getTrackingActions(projectID))).then(() => {
+    dispatch(copyActionsToProject(currentProject));
+  });
+};
 
-  let project = dispatch(getActionProject(actionList, currentProjectID));
-  if (project !== null) {
-    dispatch(sendTruckingActions(actions, project));
+const copyActionsToProject = (toProject, setActionList = true) => (dispatch, getState) => {
+  const state = getState();
+  const actionList = state.trackingReducers.project_actions_list;
 
-    let newProject = { projectID: currentProject.projectID, authorID: currentProject.authorID };
+  if (toProject) {
+    let newProject = { projectID: toProject.projectID, authorID: toProject.authorID };
     let newActionsList = [];
 
     actionList.forEach(r => {
       newActionsList.push(Object.assign({ ...r, project: newProject }));
     });
 
-    dispatch(setActionsList(newActionsList));
-    dispatch(sendTruckingActions(newActionsList, currentProject));
-    return Promise.resolve(false);
-  } else {
-    return Promise.resolve(true);
-  }
-};
-
-const getActionProject = (actions, currentProjectID) => (dispatch, getState) => {
-  let action = actions && actions.slice(-1).pop();
-  let project = null;
-  if (action && action.project.projectID !== currentProjectID) {
-    project = action.project;
+    if (setActionList === true) {
+      dispatch(setActionsList(newActionsList));
+    }
+    dispatch(sendTrackingActions(newActionsList, toProject));
   }
-  return project;
 };
 
-export const sendTruckingActionsByProjectId = (projectID, authorID) => (dispatch, getState) => {
+export const sendTrackingActionsByProjectId = (projectID, authorID) => (dispatch, getState) => {
   const state = getState();
-  const actionList = state.trackingReducers.truck_actions_list;
-  const project = { projectID, authorID };
+  const currentProject = state.projectReducers.currentProject;
+  const currentProjectID = currentProject && currentProject.projectID;
 
-  let newActionsList = [];
+  const project = { projectID, authorID };
 
-  actionList.forEach(r => {
-    newActionsList.push(Object.assign({ ...r, project: project }));
+  Promise.resolve(dispatch(getTrackingActions(currentProjectID))).then(() => {
+    dispatch(copyActionsToProject(project, false));
   });
-
-  dispatch(sendTruckingActions(newActionsList, project));
 };
diff --git a/js/reducers/tracking/trackingActions.js b/js/reducers/tracking/trackingActions.js
index adfab5fbd..154495c3f 100644
--- a/js/reducers/tracking/trackingActions.js
+++ b/js/reducers/tracking/trackingActions.js
@@ -5,25 +5,21 @@ import { constants as selectionConstants } from '../selection/constants';
 import { constants as customDatasetConstants } from '../../components/datasets/redux/constants';
 import { DJANGO_CONTEXT } from '../../utils/djangoContext';
 
-export const findTruckAction = (action, state) => {
+export const findTrackAction = (action, state) => {
   const username = DJANGO_CONTEXT['username'];
   const target_on_name = state.apiReducers.target_on_name;
   const isUndoRedoAction = state.trackingReducers.isUndoRedoAction;
-  const currentProject = state.projectReducers.currentProject;
-  const projectID = currentProject && currentProject.projectID;
-  const authorID = currentProject && currentProject.authorID;
-  let project = { projectID, authorID };
+  const isActionRestoring = state.trackingReducers.isActionRestoring;
 
-  let truckAction = null;
-  if (action.skipTracking !== true) {
+  let trackAction = null;
+  if (isActionRestoring === false && action.skipTracking !== true) {
     if (action.type.includes(apiConstants.SET_TARGET_ON)) {
       if (action.target_on) {
         let targetName = getTargetName(action.target_on, state);
-        truckAction = {
+        trackAction = {
           type: actionType.TARGET_LOADED,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: actionObjectType.TARGET,
           object_name: targetName,
           object_id: action.target_on,
@@ -36,11 +32,10 @@ export const findTruckAction = (action, state) => {
         let currentMolGroup = molGroupSelection && molGroupSelection.find(o => o === action.mol_group_on);
         if (!currentMolGroup) {
           let molGroupName = getMolGroupName(action.mol_group_on, state);
-          truckAction = {
+          trackAction = {
             type: actionType.SITE_TURNED_ON,
             timestamp: Date.now(),
             username: username,
-            project: project,
             object_type: actionObjectType.SITE,
             object_name: molGroupName,
             object_id: action.mol_group_on,
@@ -52,11 +47,10 @@ export const findTruckAction = (action, state) => {
       let objectId = action.payload && action.payload[0];
       if (objectId) {
         let molGroupName = getMolGroupName(objectId, state);
-        truckAction = {
+        trackAction = {
           type: actionType.SITE_TURNED_OFF,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: actionObjectType.SITE,
           object_name: molGroupName,
           object_id: objectId,
@@ -68,11 +62,10 @@ export const findTruckAction = (action, state) => {
         let objectType = action.item.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let objectName = action.item.name || getMoleculeName(action.item.id, state);
 
-        truckAction = {
+        trackAction = {
           type: actionType.ALL_TURNED_ON,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.item.id,
@@ -91,11 +84,10 @@ export const findTruckAction = (action, state) => {
         let objectType = action.item.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let objectName = action.item.name || getMoleculeName(action.item.id, state);
 
-        truckAction = {
+        trackAction = {
           type: actionType.ALL_TURNED_OFF,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.item.id,
@@ -115,11 +107,10 @@ export const findTruckAction = (action, state) => {
         let objectType = payload.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let paylodTypeDescription = getTypeDescriptionOfSelectedAllAction(payload.type);
 
-        truckAction = {
+        trackAction = {
           type: actionType.ALL_TURNED_ON_BY_TYPE,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           control_type: payload.type,
           items: payload.items,
@@ -132,11 +123,10 @@ export const findTruckAction = (action, state) => {
         let objectType = payload.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let paylodTypeDescription = getTypeDescriptionOfSelectedAllAction(payload.type);
 
-        truckAction = {
+        trackAction = {
           type: actionType.ALL_TURNED_OFF_BY_TYPE,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           control_type: payload.type,
           items: payload.items,
@@ -148,11 +138,10 @@ export const findTruckAction = (action, state) => {
         let objectType = action.item.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let objectName = action.item.name || getMoleculeName(action.item.id, state);
 
-        truckAction = {
+        trackAction = {
           type: actionType.LIGAND_TURNED_ON,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.item.id,
@@ -167,11 +156,10 @@ export const findTruckAction = (action, state) => {
         let objectType = action.item.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let objectName = action.item.name || getMoleculeName(action.item.id, state);
 
-        truckAction = {
+        trackAction = {
           type: actionType.LIGAND_TURNED_OFF,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.item.id,
@@ -186,11 +174,10 @@ export const findTruckAction = (action, state) => {
         let objectType = action.item.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let objectName = action.item.name || getMoleculeName(action.item.id, state);
 
-        truckAction = {
+        trackAction = {
           type: actionType.SIDECHAINS_TURNED_ON,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.item.id,
@@ -205,11 +192,10 @@ export const findTruckAction = (action, state) => {
         let objectType = action.item.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let objectName = action.item.name || getMoleculeName(action.item.id, state);
 
-        truckAction = {
+        trackAction = {
           type: actionType.SIDECHAINS_TURNED_OFF,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.item.id,
@@ -224,11 +210,10 @@ export const findTruckAction = (action, state) => {
         let objectType = action.item.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let objectName = action.item.name || getMoleculeName(action.item.id, state);
 
-        truckAction = {
+        trackAction = {
           type: actionType.INTERACTIONS_TURNED_ON,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.item.id,
@@ -243,11 +228,10 @@ export const findTruckAction = (action, state) => {
         let objectType = action.item.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let objectName = action.item.name || getMoleculeName(action.item.id, state);
 
-        truckAction = {
+        trackAction = {
           type: actionType.INTERACTIONS_TURNED_OFF,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.item.id,
@@ -262,11 +246,10 @@ export const findTruckAction = (action, state) => {
         let objectType = action.item.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let objectName = action.item.name || getMoleculeName(action.item.id, state);
 
-        truckAction = {
+        trackAction = {
           type: actionType.SURFACE_TURNED_ON,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.item.id,
@@ -281,11 +264,10 @@ export const findTruckAction = (action, state) => {
         let objectType = action.item.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let objectName = action.item.name || getMoleculeName(action.item.id, state);
 
-        truckAction = {
+        trackAction = {
           type: actionType.SURFACE_TURNED_OFF,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.item.id,
@@ -300,11 +282,10 @@ export const findTruckAction = (action, state) => {
         let objectType = action.item.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let objectName = action.item.name || getMoleculeName(action.item.id, state);
 
-        truckAction = {
+        trackAction = {
           type: actionType.VECTORS_TURNED_ON,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.item.id,
@@ -319,11 +300,10 @@ export const findTruckAction = (action, state) => {
         let objectType = action.item.isInspiration === true ? actionObjectType.INSPIRATION : actionObjectType.MOLECULE;
         let objectName = action.item.name || getMoleculeName(action.item.id, state);
 
-        truckAction = {
+        trackAction = {
           type: actionType.VECTORS_TURNED_OFF,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.item.id,
@@ -338,11 +318,10 @@ export const findTruckAction = (action, state) => {
         let objectType = actionObjectType.MOLECULE;
         let objectName = action.vector;
 
-        truckAction = {
+        trackAction = {
           type: actionType.MOLECULE_ADDED_TO_SHOPPING_CART,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: actionObjectType.MOLECULE,
           object_name: objectName,
           object_id: objectName,
@@ -355,11 +334,10 @@ export const findTruckAction = (action, state) => {
         let objectType = actionObjectType.MOLECULE;
         let objectName = action.vector;
 
-        truckAction = {
+        trackAction = {
           type: actionType.MOLECULE_REMOVED_FROM_SHOPPING_CART,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: objectName,
@@ -372,11 +350,10 @@ export const findTruckAction = (action, state) => {
         let objectType = actionObjectType.MOLECULE;
         let objectName = action.payload;
 
-        truckAction = {
+        trackAction = {
           type: actionType.VECTOR_SELECTED,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload,
@@ -388,11 +365,10 @@ export const findTruckAction = (action, state) => {
         let objectType = actionObjectType.COMPOUND;
         let objectName = action.payload.moleculeTitle;
 
-        truckAction = {
+        trackAction = {
           type: actionType.COMPOUND_SELECTED,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload.moleculeID,
@@ -405,11 +381,10 @@ export const findTruckAction = (action, state) => {
         let objectType = actionObjectType.COMPOUND;
         let objectName = action.payload.moleculeTitle;
 
-        truckAction = {
+        trackAction = {
           type: actionType.COMPOUND_DESELECTED,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload.moleculeID,
@@ -423,11 +398,10 @@ export const findTruckAction = (action, state) => {
           action.payload.item.isCrossReference === true ? actionObjectType.CROSS_REFERENCE : actionObjectType.COMPOUND;
         let objectName = action.payload.item.name;
 
-        truckAction = {
+        trackAction = {
           type: actionType.ALL_TURNED_ON,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload.item.id,
@@ -445,11 +419,10 @@ export const findTruckAction = (action, state) => {
           action.payload.item.isCrossReference === true ? actionObjectType.CROSS_REFERENCE : actionObjectType.COMPOUND;
         let objectName = action.payload.item.name;
 
-        truckAction = {
+        trackAction = {
           type: actionType.ALL_TURNED_OFF,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload.item.id,
@@ -469,11 +442,10 @@ export const findTruckAction = (action, state) => {
         let paylodTypeDescription = getTypeDescriptionOfSelectedAllAction(payload.type);
         let datasetDescription = payload.datasetID ? `of dataset: ${payload.datasetID}` : '';
 
-        truckAction = {
+        trackAction = {
           type: actionType.ALL_TURNED_ON_BY_TYPE,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           control_type: payload.type,
           items: payload.items,
@@ -488,11 +460,10 @@ export const findTruckAction = (action, state) => {
         let paylodTypeDescription = getTypeDescriptionOfSelectedAllAction(payload.type);
         let datasetDescription = payload.datasetID ? `of dataset: ${payload.datasetID}` : '';
 
-        truckAction = {
+        trackAction = {
           type: actionType.ALL_TURNED_OFF_BY_TYPE,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           control_type: payload.type,
           items: payload.items,
@@ -505,11 +476,10 @@ export const findTruckAction = (action, state) => {
           action.payload.item.isCrossReference === true ? actionObjectType.CROSS_REFERENCE : actionObjectType.COMPOUND;
         let objectName = action.payload.item.name;
 
-        truckAction = {
+        trackAction = {
           type: actionType.LIGAND_TURNED_ON,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload.item.id,
@@ -523,11 +493,10 @@ export const findTruckAction = (action, state) => {
           action.payload.item.isCrossReference === true ? actionObjectType.CROSS_REFERENCE : actionObjectType.COMPOUND;
         let objectName = action.payload.item.name;
 
-        truckAction = {
+        trackAction = {
           type: actionType.LIGAND_TURNED_OFF,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload.item.id,
@@ -541,11 +510,10 @@ export const findTruckAction = (action, state) => {
           action.payload.item.isCrossReference === true ? actionObjectType.CROSS_REFERENCE : actionObjectType.COMPOUND;
         let objectName = action.payload.item.name;
 
-        truckAction = {
+        trackAction = {
           type: actionType.SIDECHAINS_TURNED_ON,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload.item.id,
@@ -559,11 +527,10 @@ export const findTruckAction = (action, state) => {
           action.payload.item.isCrossReference === true ? actionObjectType.CROSS_REFERENCE : actionObjectType.COMPOUND;
         let objectName = action.payload.item.name;
 
-        truckAction = {
+        trackAction = {
           type: actionType.SIDECHAINS_TURNED_OFF,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload.item.id,
@@ -577,11 +544,10 @@ export const findTruckAction = (action, state) => {
           action.payload.item.isCrossReference === true ? actionObjectType.CROSS_REFERENCE : actionObjectType.COMPOUND;
         let objectName = action.payload.item.name;
 
-        truckAction = {
+        trackAction = {
           type: actionType.INTERACTIONS_TURNED_ON,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload.item.id,
@@ -595,11 +561,10 @@ export const findTruckAction = (action, state) => {
           action.payload.item.isCrossReference === true ? actionObjectType.CROSS_REFERENCE : actionObjectType.COMPOUND;
         let objectName = action.payload.item.name;
 
-        truckAction = {
+        trackAction = {
           type: actionType.INTERACTIONS_TURNED_OFF,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload.item.id,
@@ -613,11 +578,10 @@ export const findTruckAction = (action, state) => {
           action.payload.item.isCrossReference === true ? actionObjectType.CROSS_REFERENCE : actionObjectType.COMPOUND;
         let objectName = action.payload.item.name;
 
-        truckAction = {
+        trackAction = {
           type: actionType.SURFACE_TURNED_ON,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload.item.id,
@@ -631,11 +595,10 @@ export const findTruckAction = (action, state) => {
           action.payload.item.isCrossReference === true ? actionObjectType.CROSS_REFERENCE : actionObjectType.COMPOUND;
         let objectName = action.payload.item.name;
 
-        truckAction = {
+        trackAction = {
           type: actionType.SURFACE_TURNED_OFF,
           timestamp: Date.now(),
           username: username,
-          project: project,
           object_type: objectType,
           object_name: objectName,
           object_id: action.payload.item.id,
@@ -646,11 +609,10 @@ export const findTruckAction = (action, state) => {
     } else if (action.type.includes(nglConstants.UPDATE_COMPONENT_REPRESENTATION)) {
       let objectType = actionObjectType.REPRESENTATION;
 
-      truckAction = {
+      trackAction = {
         type: actionType.REPRESENTATION_CHANGED,
         timestamp: Date.now(),
         username: username,
-        project: project,
         object_type: actionObjectType.REPRESENTATION,
         object_name: action.objectInViewID,
         object_id: action.objectInViewID,
@@ -663,11 +625,10 @@ export const findTruckAction = (action, state) => {
       let objectType = actionObjectType.REPRESENTATION;
       let representationName = action.newRepresentation && action.newRepresentation.type;
 
-      truckAction = {
+      trackAction = {
         type: actionType.REPRESENTATION_ADDED,
         timestamp: Date.now(),
         username: username,
-        project: project,
         object_type: actionObjectType.REPRESENTATION,
         object_name: representationName,
         object_id: action.objectInViewID,
@@ -678,11 +639,10 @@ export const findTruckAction = (action, state) => {
       let objectType = actionObjectType.REPRESENTATION;
       let representationName = action.representation && action.representation.type;
 
-      truckAction = {
+      trackAction = {
         type: actionType.REPRESENTATION_REMOVED,
         timestamp: Date.now(),
         username: username,
-        project: project,
         object_type: objectType,
         object_name: representationName,
         object_id: action.objectInViewID,
@@ -691,11 +651,11 @@ export const findTruckAction = (action, state) => {
       };
     }
   }
-  return truckAction;
+  return trackAction;
 };
 
 const getMoleculeTitle = (objectName, targetName) => {
-  let title = objectName.replace(`${targetName}-`, '');
+  let title = objectName.replace(new RegExp(`${targetName}-`, 'i'), '');
   return title;
 };
 
diff --git a/js/reducers/tracking/trackingMiddleware.js b/js/reducers/tracking/trackingMiddleware.js
index ab99d3a26..a86a2b1a5 100644
--- a/js/reducers/tracking/trackingMiddleware.js
+++ b/js/reducers/tracking/trackingMiddleware.js
@@ -1,6 +1,6 @@
-import { appendAndSendTruckingActions } from './dispatchActions';
+import { appendAndSendTrackingActions } from './dispatchActions';
 import { constants } from './constants';
-import { findTruckAction } from './trackingActions';
+import { findTrackAction } from './trackingActions';
 
 const trackingMiddleware = ({ dispatch, getState }) => next => action => {
   //console.log(`Redux Log:`, action);
@@ -8,9 +8,9 @@ const trackingMiddleware = ({ dispatch, getState }) => next => action => {
   if (action) {
     const state = getState();
     if (action && !action.type.includes(constants.APPEND_ACTIONS_LIST)) {
-      let truckAction = findTruckAction(action, state);
-      if (truckAction && truckAction != null) {
-        dispatch(appendAndSendTruckingActions(truckAction));
+      let trackAction = findTrackAction(action, state);
+      if (trackAction && trackAction != null) {
+        dispatch(appendAndSendTrackingActions(trackAction));
       }
     }
 
diff --git a/js/reducers/tracking/trackingReducers.js b/js/reducers/tracking/trackingReducers.js
index 8125afb70..eb8269339 100644
--- a/js/reducers/tracking/trackingReducers.js
+++ b/js/reducers/tracking/trackingReducers.js
@@ -2,27 +2,29 @@ import { constants } from './constants';
 import undoable, { includeAction } from 'redux-undo';
 
 export const INITIAL_STATE = {
-  truck_actions_list: [],
+  track_actions_list: [],
   current_actions_list: [],
   isTrackingMoleculesRestoring: false,
   isTrackingCompoundsRestoring: false,
   isUndoRedoAction: false,
   isActionsSending: false,
   isActionsLoading: false,
+  isActionSaving: false,
   send_actions_list: [],
-  project_actions_list: []
+  project_actions_list: [],
+  isActionRestoring: false
 };
 
 export function trackingReducers(state = INITIAL_STATE, action = {}) {
   switch (action.type) {
     case constants.SET_ACTIONS_LIST:
       return Object.assign({}, state, {
-        truck_actions_list: action.truck_actions_list
+        track_actions_list: action.track_actions_list
       });
 
     case constants.APPEND_ACTIONS_LIST:
       return Object.assign({}, state, {
-        truck_actions_list: [...new Set([...state.truck_actions_list, action.truck_action])]
+        track_actions_list: [...new Set([...state.track_actions_list, action.track_action])]
       });
 
     case constants.SET_CURRENT_ACTIONS_LIST:
@@ -62,7 +64,7 @@ export function trackingReducers(state = INITIAL_STATE, action = {}) {
 
     case constants.APPEND_SEND_ACTIONS_LIST:
       return Object.assign({}, state, {
-        send_actions_list: [...new Set([...state.send_actions_list, action.truck_action])]
+        send_actions_list: [...new Set([...state.send_actions_list, action.track_action])]
       });
 
     case constants.SET_PROJECT_ACTIONS_LIST:
@@ -70,6 +72,16 @@ export function trackingReducers(state = INITIAL_STATE, action = {}) {
         project_actions_list: action.project_actions_list
       });
 
+    case constants.SET_IS_ACTIONS_SAVING:
+      return Object.assign({}, state, {
+        isActionSaving: action.isActionSaving
+      });
+
+    case constants.SET_IS_ACTIONS_RESTORING:
+      return Object.assign({}, state, {
+        isActionRestoring: action.isActionRestoring
+      });
+
     default:
       return state;
   }