diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8f590ad..7ca1669 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,646 +1,706 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="32058667-6761-4492-a704-290762d93e35" name="Default Changelist" comment="">
+<<<<<<< Updated upstream
       <change beforePath="$PROJECT_DIR$/.idea/webServers.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/webServers.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/js/costcalc_main.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/js/costcalc_main.jsx" afterDir="false" />
+=======
+>>>>>>> Stashed changes
       <change beforePath="$PROJECT_DIR$/js/data.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/data.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
     <ignored path="$PROJECT_DIR$/tmp/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FUSProjectUsageTrigger">
     <session id="-1435277962">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="4" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.8" value="1" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.opened" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="back" value="1" />
           <entry key="css" value="1" />
           <entry key="html" value="3" />
           <entry key="js" value="11" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CSS" value="1" />
           <entry key="HTML" value="3" />
           <entry key="JavaScript" value="11" />
           <entry key="PLAIN_TEXT" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="html" value="1223" />
           <entry key="js" value="2620" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
           <entry key="HTML" value="1223" />
           <entry key="JavaScript" value="2620" />
         </counts>
       </usages-collector>
     </session>
     <session id="-1962752238">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="12" />
           <entry key="project.open.time.0" value="1" />
           <entry key="project.open.time.1" value="2" />
           <entry key="project.open.time.4" value="6" />
           <entry key="project.open.time.5" value="4" />
           <entry key="project.opened" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="css" value="101" />
           <entry key="html" value="589" />
           <entry key="js" value="7068" />
           <entry key="jsx" value="8990" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
           <entry key="CSS" value="101" />
           <entry key="HTML" value="589" />
           <entry key="JSX Harmony" value="8990" />
           <entry key="JavaScript" value="7068" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="html" value="1" />
           <entry key="js" value="4" />
           <entry key="jsx" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="HTML" value="1" />
           <entry key="JSX Harmony" value="3" />
           <entry key="JavaScript" value="4" />
         </counts>
       </usages-collector>
     </session>
     <session id="2130354723">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="5" />
           <entry key="project.open.time.10" value="1" />
           <entry key="project.open.time.14" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.19" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.opened" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="css" value="199" />
           <entry key="html" value="101" />
           <entry key="js" value="11107" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
           <entry key="CSS" value="199" />
           <entry key="HTML" value="101" />
           <entry key="JavaScript" value="11107" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="css" value="1" />
           <entry key="js" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CSS" value="1" />
           <entry key="JavaScript" value="2" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FavoritesManager">
     <favorites_list name="costcalc" />
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/index.html">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="78">
               <caret line="3" column="26" lean-forward="true" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/index-dev.html">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="416">
               <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/js/costcalc_main.jsx">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="317">
               <caret line="1266" column="68" selection-start-line="1266" selection-start-column="68" selection-end-line="1266" selection-end-column="68" />
               <folding>
                 <element signature="e#106#252#0" />
                 <element signature="e#281#365#0" />
                 <element signature="e#393#573#0" />
                 <element signature="e#692#858#0" />
                 <element signature="e#799#1680#0" />
                 <element signature="e#1705#1964#0" />
                 <element signature="e#2036#2942#0" />
                 <element signature="e#2944#4994#0" />
                 <element signature="e#4996#5933#0" />
                 <element signature="e#5935#6673#0" />
                 <element signature="e#6675#7055#0" />
                 <element signature="e#7057#9007#0" />
                 <element signature="e#9009#9591#0" />
                 <element signature="e#9593#10677#0" />
                 <element signature="e#10679#11733#0" />
                 <element signature="e#11807#12628#0" />
                 <element signature="e#12656#12843#0" />
                 <element signature="e#12917#15208#0" />
                 <element signature="e#15210#18298#0" />
                 <element signature="e#18300#19748#0" />
                 <element signature="e#19750#20168#0" />
                 <element signature="e#20170#22878#0" />
                 <element signature="e#22949#29456#0" />
                 <element signature="e#25685#28454#0" />
                 <element signature="e#29458#33321#0" />
                 <element signature="e#33323#36138#0" />
                 <element signature="e#33952#34142#0" />
                 <element signature="e#34339#34456#0" />
                 <element signature="e#35165#35215#0" />
                 <element signature="e#35228#35303#0" />
                 <element signature="e#36140#38055#0" />
                 <element signature="e#38175#38466#0" />
                 <element signature="e#38496#38597#0" />
                 <element signature="e#38625#39028#0" />
                 <element signature="e#39563#44109#0" />
                 <element signature="e#44127#44980#0" />
                 <element signature="e#46597#46712#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/js/costcalc_export.jsx">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="-757">
               <caret line="19" selection-start-line="19" selection-end-line="19" />
               <folding>
                 <element signature="n#!!block;n#constructor#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#export_btn#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#options_btn#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#hide#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#make_copy#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#htmlout#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#htmlsrcout#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#markout#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#makecol#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#htmltable#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#htmlsrctable#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#read_export#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#read_options#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#fnSelect#0;n#ManageExport#0" />
                 <element signature="n#!!block;n#fnDeSelect#0;n#ManageExport#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/css/costcalc.css">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="2782">
               <caret line="107" column="19" selection-start-line="107" selection-start-column="19" selection-end-line="107" selection-end-column="19" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/js/data.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="646">
+<<<<<<< Updated upstream
               <caret line="345" column="25" selection-start-line="345" selection-start-column="25" selection-end-line="345" selection-end-column="25" />
+=======
+              <caret line="349" column="19" selection-start-line="349" selection-start-column="19" selection-end-line="349" selection-end-column="19" />
+>>>>>>> Stashed changes
               <folding>
                 <element signature="n#!!doc" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="HTML File" />
         <option value="JavaScript File" />
       </list>
     </option>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>tip</find>
       <find>tooltip</find>
       <find>url</find>
       <find>icon</find>
       <find>props.data.</find>
       <find>data</find>
       <find>ButtonInput</find>
       <find>TxtInput</find>
       <find>numeric</find>
       <find>here</find>
       <find>if</find>
       <find>UserCost</find>
       <find>&gt;</find>
       <find>upd</find>
       <find>rawexport</find>
       <find>randomint</find>
       <find>console</find>
     </findStrings>
     <replaceStrings>
       <replace>Url</replace>
       <replace>Icon</replace>
       <replace>Data</replace>
       <replace>UserCostSelect</replace>
       <replace>&amp;gt;</replace>
       <replace>&amp;lt</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/costcal.js" />
         <option value="$PROJECT_DIR$/js/costcal.js" />
         <option value="$PROJECT_DIR$/js/jquery.loan-calculator.js" />
         <option value="$PROJECT_DIR$/js/back" />
         <option value="$PROJECT_DIR$/js/jquery.nas-calculator.js" />
         <option value="$PROJECT_DIR$/script.js" />
         <option value="$PROJECT_DIR$/js/script.js" />
         <option value="$PROJECT_DIR$/js/popper.-1.14.3.min.js" />
         <option value="$PROJECT_DIR$/js/costcal_export.js" />
         <option value="$PROJECT_DIR$/js/costcal_export.jsx" />
         <option value="$PROJECT_DIR$/js/costcalc_main.js" />
         <option value="$PROJECT_DIR$/css/costcalc.css" />
         <option value="$PROJECT_DIR$/index-dev.html" />
         <option value="$PROJECT_DIR$/js/costcalc_export.jsx" />
         <option value="$PROJECT_DIR$/index.html" />
+<<<<<<< Updated upstream
         <option value="$PROJECT_DIR$/js/data.js" />
+=======
+        <option value="$PROJECT_DIR$/js/costcalc_export.jsx" />
+>>>>>>> Stashed changes
         <option value="$PROJECT_DIR$/js/costcalc_main.jsx" />
+        <option value="$PROJECT_DIR$/js/data.js" />
       </list>
     </option>
   </component>
   <component name="JsBowerSettings">
     <node-interpreter value="project" />
     <bower-package value="" />
     <bower.json value="" />
   </component>
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsFlowSettings">
     <service-enabled>true</service-enabled>
     <exe-path />
     <other-services-enabled>true</other-services-enabled>
     <auto-save>true</auto-save>
   </component>
   <component name="JsGulpfileManager">
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="50" />
     <option name="y" value="23" />
     <option name="width" value="1680" />
     <option name="height" value="1027" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="1" id="Add" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
               <item name="costcalc" type="b2602c69:ProjectViewProjectNode" />
               <item name="costcalc" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="WebServerToolWindowPanel.toolwindow.highlight.mappings" value="true" />
     <property name="WebServerToolWindowPanel.toolwindow.highlight.symlinks" value="true" />
     <property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
     <property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
     <property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/index.html" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="settings.editor.selected.configurable" value="web.server" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\almasson\WebstormProjects\costcalc\js" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$" />
       <recent name="C:\Users\almasson\WebstormProjects\costcalc\js" />
     </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
         <RuleState>
           <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
         </RuleState>
         <RuleState>
           <option name="name" value="StatusDashboardGroupingRule" />
         </RuleState>
       </list>
     </option>
   </component>
   <component name="RunManager">
     <configuration default="true" type="EMBER_SERVE_CONFIGURATION" factoryName="Ember serve configuration factory">
       <option name="PORT" value="" />
       <option name="HOST" value="" />
       <option name="ENVIRONMENT" value="development" />
       <option name="OUTPUT_PATH" value="" />
       <option name="WATCHER" value="" />
       <option name="PROXY" value="" />
       <option name="PROXY_SECURE" value="true" />
       <option name="PROXY_TRANSPARENT" value="true" />
       <option name="LIVE_RELOAD" value="true" />
       <option name="LIVE_RELOAD_HOST" value="" />
       <option name="LIVE_RELOAD_BASE_URL" value="" />
       <option name="LIVE_RELOAD_PORT" value="" />
       <option name="SSL" value="false" />
       <option name="SSL_KEY" value="" />
       <option name="SSL_CERT" value="" />
       <method v="2" />
     </configuration>
     <configuration name="Unnamed" type="JavascriptDebugType" factoryName="JavaScript Debug" uri="http://localhost:63342/index.html?_ijt=guj9n9f47nlcpp7nsqo0ugkca2" useFirstLineBreakpoints="true">
       <method v="2" />
     </configuration>
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="32058667-6761-4492-a704-290762d93e35" name="Default Changelist" comment="" />
       <created>1535982823834</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1535982823834</updated>
       <workItem from="1535982828668" duration="19283000" />
       <workItem from="1536218261639" duration="6867000" />
       <workItem from="1536319807631" duration="928000" />
       <workItem from="1536320859977" duration="9682000" />
       <workItem from="1536564487126" duration="16495000" />
       <workItem from="1536587075054" duration="5104000" />
       <workItem from="1536649322932" duration="826000" />
       <workItem from="1536667806952" duration="596000" />
       <workItem from="1536829100586" duration="23501000" />
       <workItem from="1537433681918" duration="7558000" />
       <workItem from="1537443755183" duration="777000" />
       <workItem from="1537444693375" duration="28067000" />
       <workItem from="1537778687831" duration="229000" />
       <workItem from="1537778949283" duration="9793000" />
       <workItem from="1537868487913" duration="6560000" />
       <workItem from="1538057441035" duration="831000" />
       <workItem from="1538566211349" duration="10000" />
       <workItem from="1538566236416" duration="43507000" />
       <workItem from="1538753560735" duration="148000" />
       <workItem from="1538983049522" duration="788000" />
       <workItem from="1538993043104" duration="34000" />
       <workItem from="1538993660872" duration="37000" />
       <workItem from="1540301753994" duration="575000" />
       <workItem from="1543480920205" duration="802000" />
+<<<<<<< Updated upstream
+=======
+      <workItem from="1543488993157" duration="1063000" />
+>>>>>>> Stashed changes
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
+<<<<<<< Updated upstream
     <option name="totallyTimeSpent" value="196263000" />
+=======
+    <option name="totallyTimeSpent" value="197326000" />
+>>>>>>> Stashed changes
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
       <is-autoscroll-to-source value="true" />
     </todo-panel>
     <todo-panel id="all">
       <are-packages-shown value="true" />
       <is-autoscroll-to-source value="true" />
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
     <frame x="50" y="23" width="1680" height="1027" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.48966268" visible="true" weight="0.17842074" />
       <window_info id="Structure" order="1" sideWeight="0.51033735" side_tool="true" visible="true" weight="0.17842074" />
       <window_info id="Favorites" order="2" sideWeight="0.50117373" side_tool="true" weight="0.2496329" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3284091" />
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39981273" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3297062" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" weight="0.3297062" />
       <window_info anchor="bottom" id="Terminal" order="9" weight="0.3297062" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.3297062" />
       <window_info anchor="bottom" id="File Transfer" order="11" visible="true" weight="0.22198041" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Remote Host" order="3" weight="0.28823856" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/js/bootstrap.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/js/bootstrap.bundle.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/js/costcal.js" />
     <entry file="file://$PROJECT_DIR$/js/jquery.loan-calculator.js" />
     <entry file="file://$PROJECT_DIR$/js/back" />
     <entry file="file://$PROJECT_DIR$/js/jquery-ui.css" />
     <entry file="file://$USER_HOME$/Desktop/6668a1f6986742109c00a581ce704605-f6c882b6ae18bde42dcf6fdb751aae93495a2275/index.html" />
     <entry file="file://$PROJECT_DIR$/js/jsonform.js" />
     <entry file="file://$PROJECT_DIR$/js/like_button.js" />
     <entry file="file://$PROJECT_DIR$/js/jquery.nas-calculator.js" />
     <entry file="file://$PROJECT_DIR$/js/popper-1.14.3.min.js" />
     <entry file="file://$PROJECT_DIR$/js/costcal_export.js" />
     <entry file="file://$PROJECT_DIR$/js/costcal_export.jsx" />
     <entry file="file://$PROJECT_DIR$/js/costcalc_main.js" />
     <entry file="file://$PROJECT_DIR$/css/costcalc.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2782">
           <caret line="107" column="19" selection-start-line="107" selection-start-column="19" selection-end-line="107" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/index-dev.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="416">
           <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/js/data.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="646">
           <caret line="345" column="25" selection-start-line="345" selection-start-column="25" selection-end-line="345" selection-end-column="25" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/js/costcalc_main.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="475">
+          <caret line="565" column="39" lean-forward="true" selection-start-line="565" selection-start-column="39" selection-end-line="565" selection-end-column="39" />
+          <folding>
+            <element signature="e#106#252#0" />
+            <element signature="e#281#365#0" />
+            <element signature="e#393#573#0" />
+            <element signature="e#799#1680#0" />
+            <element signature="e#1705#1964#0" />
+            <element signature="e#2036#2942#0" />
+            <element signature="e#4996#5933#0" />
+            <element signature="e#5935#6673#0" />
+            <element signature="e#6675#7055#0" />
+            <element signature="e#7057#9007#0" />
+            <element signature="e#9009#9591#0" />
+            <element signature="e#9593#10677#0" />
+            <element signature="e#10679#11733#0" />
+            <element signature="e#11807#12628#0" />
+            <element signature="e#12656#12843#0" />
+            <element signature="e#12917#15208#0" />
+            <element signature="e#15210#18298#0" />
+            <element signature="e#19750#20168#0" />
+            <element signature="e#20170#22878#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/js/costcalc_export.jsx">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-757">
           <caret line="19" selection-start-line="19" selection-end-line="19" />
           <folding>
             <element signature="n#!!block;n#constructor#0;n#ManageExport#0" />
             <element signature="n#!!block;n#export_btn#0;n#ManageExport#0" />
             <element signature="n#!!block;n#options_btn#0;n#ManageExport#0" />
             <element signature="n#!!block;n#hide#0;n#ManageExport#0" />
             <element signature="n#!!block;n#make_copy#0;n#ManageExport#0" />
             <element signature="n#!!block;n#htmlout#0;n#ManageExport#0" />
             <element signature="n#!!block;n#htmlsrcout#0;n#ManageExport#0" />
             <element signature="n#!!block;n#markout#0;n#ManageExport#0" />
             <element signature="n#!!block;n#makecol#0;n#ManageExport#0" />
             <element signature="n#!!block;n#htmltable#0;n#ManageExport#0" />
             <element signature="n#!!block;n#htmlsrctable#0;n#ManageExport#0" />
             <element signature="n#!!block;n#read_export#0;n#ManageExport#0" />
             <element signature="n#!!block;n#read_options#0;n#ManageExport#0" />
             <element signature="n#!!block;n#fnSelect#0;n#ManageExport#0" />
             <element signature="n#!!block;n#fnDeSelect#0;n#ManageExport#0" />
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< Updated upstream
     <entry file="file://$PROJECT_DIR$/js/costcalc_main.jsx">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="317">
           <caret line="1266" column="68" selection-start-line="1266" selection-start-column="68" selection-end-line="1266" selection-end-column="68" />
           <folding>
             <element signature="e#106#252#0" />
             <element signature="e#281#365#0" />
             <element signature="e#393#573#0" />
             <element signature="e#692#858#0" />
             <element signature="e#799#1680#0" />
             <element signature="e#1705#1964#0" />
             <element signature="e#2036#2942#0" />
             <element signature="e#2944#4994#0" />
             <element signature="e#4996#5933#0" />
             <element signature="e#5935#6673#0" />
             <element signature="e#6675#7055#0" />
             <element signature="e#7057#9007#0" />
             <element signature="e#9009#9591#0" />
             <element signature="e#9593#10677#0" />
             <element signature="e#10679#11733#0" />
             <element signature="e#11807#12628#0" />
             <element signature="e#12656#12843#0" />
             <element signature="e#12917#15208#0" />
             <element signature="e#15210#18298#0" />
             <element signature="e#18300#19748#0" />
             <element signature="e#19750#20168#0" />
             <element signature="e#20170#22878#0" />
             <element signature="e#22949#29456#0" />
             <element signature="e#25685#28454#0" />
             <element signature="e#29458#33321#0" />
             <element signature="e#33323#36138#0" />
             <element signature="e#33952#34142#0" />
             <element signature="e#34339#34456#0" />
             <element signature="e#35165#35215#0" />
             <element signature="e#35228#35303#0" />
             <element signature="e#36140#38055#0" />
             <element signature="e#38175#38466#0" />
             <element signature="e#38496#38597#0" />
             <element signature="e#38625#39028#0" />
             <element signature="e#39563#44109#0" />
             <element signature="e#44127#44980#0" />
             <element signature="e#46597#46712#0" />
+=======
+    <entry file="file://$PROJECT_DIR$/js/data.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="646">
+          <caret line="349" column="19" selection-start-line="349" selection-start-column="19" selection-end-line="349" selection-end-column="19" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+>>>>>>> Stashed changes
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< Updated upstream
     <entry file="file://$PROJECT_DIR$/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="78">
           <caret line="3" column="26" lean-forward="true" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
         </state>
       </provider>
     </entry>
+=======
+>>>>>>> Stashed changes
   </component>
   <component name="masterDetails">
     <states>
       <state key="ScopeChooserConfigurable.UI">
         <settings>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
         </settings>
       </state>
     </states>
   </component>
 </project>
\ No newline at end of file
diff --git a/js/data.js b/js/data.js
index 2a84b65..5cdf0d6 100644
--- a/js/data.js
+++ b/js/data.js
@@ -1,352 +1,352 @@
 // Providers
 // ----------------------------------------------------
 // ----------------------------------------------------
 // Storage
 const NasEpfl =  {
     Style: "AmountRatesCost",
     Provider : "EPFL-VPSI",
     Name:'NAS',
     Url : [
         {Name:'VPSI-Website',Url:'https://support.epfl.ch/help/epfl?id=epfl_service_status&service=49a363acdb34c700ef64731b8c96191f'},
         {Name:'SV-IT Storage Website',Url:'https://sv-it.epfl.ch/stockage'}
     ],
     AmountName: "Amount",
     AmountUnit: "TB",
     AmountMin : 1,
     AmountMax : 100,
     AmountStep : 1,
     AmountFree:1,
     AmountFreeCumulative:false,
     RateVar : true,
     RateName : 'Performance',
     Rates : {
         'Collaborative': 165,
         'On-line archive': 110,
         'Raw': 55
     },
     RateUnit : "CHF / TB"
 };
 
 
 const SwitchEpfl = {
     Style : 'CategoryCost',
     Provider : "Switch-EPFL",
     Name:'Online Storage',
     Url : [
         {Name:'Switch Website',Url:'https://drive.switch.ch/'}
     ],
     CatName:'Options',
     Cat:{
         'Cloud Based max 50GB':0,
     },
     CatUnit:'CHF',
 };
 
 const GoogleDriveEdu = {
     Style : 'CategoryCost',
     Provider : "Google Drive Educ",
     Name:'Online Storage',
     ExtraInfo : "Google Storage is not recommanded as the data are stored outside of Switzerland",
     ExtraInfoUrl :"https://support.epfl.ch//kb_view_customer.do?sysparm_article=KB0012829",
     Url : [
         {Name :'Google Education Page',Url:'https://edu.google.com/?modal_active=none'}
     ],
     CatName:'Options',
     Cat:{
         'Cloud Based illimited':0,
     },
     CatUnit:'CHF',
 };
 
 
 // ELN
 const SLIMSEpfl =  {
     Style:'CategoryAmountRatesCost',
     Provider : "EPFL-SV-IT",
     Name:'SLIMS',
     Url : [
         {Name:'SLIMS on SV-IT Website',Url:'https://sv-it.epfl.ch/lims'},
         {Name: 'Genohm (SLIMS Company)',Url:'https://www.genohm.com/'}
     ],
     CatName:'PI Status',
     Cat:{
         'Full Professor':3000,
         'Associate Professor':2000,
         'Tenure Track Assistant Professor or Core Facility':1000
     },
     CatUnit:'CHF',
     AmountName: "Storage",
     AmountUnit: "TB",
     AmountMin : 1,
     AmountMax : 100,
     AmountStep : 1,
     AmountFree:0,
     AmountFreeCumulative:false,
     RateVar : true,
     RateName: 'ELN Storage',
     Rates : {
         'Stored on EPFL Server': 165,
     },
     RateUnit : "CHF / TB"
 };
 
 // Database
 const MysqlEpfl = {
     Style : 'CategoryCost',
     Provider : "EPFL-VPSI",
     Name:'MySql',
     Url : [
         {Name:'EPFL VPSI ',Url:'https://support.epfl.ch/epfl?id=epfl_service_status&service=eb026fa0db34c700ef64731b8c96198e'}
     ],
     CatName:'Options',
     Cat:{
         'MySQL max 2GB':0,
     },
     CatUnit:'CHF',
 };
 
 // Repository
 const Zenodo = {
     Style : 'CategoryCost',
     Provider : "Zenodo-CERN",
     Name:'Zenodo',
     Url : [
         {Name:'Zenodo Website',Url:'https://www.zenodo.org/'},
         {Name:'About Zenodo',Url:'http://about.zenodo.org/'},
     ],
     CatName:'Options',
     Cat:{
         'Max 50GB per Dataset':0,
     },
     CatUnit:'CHF',
 };
 
 const C4science = {
     Style : 'CategoryCost',
     Provider : "EPFL-SCITAS",
     Name:'C4Science',
     Url : [
         {Name:'C4Science Website',Url:'https://www.c4science.ch/'}
     ],
     CatName:'Options',
     Cat:{
         'Free for text file':0,
     },
     CatUnit:'CHF',
 };
 
 const Github = {
     Style: "AmountRatesCost",
     Provider : "GitHub",
     Name:'GitHub',
     Url : [
         {Name:'Github Website Pricing',Url:'https://github.com/pricing'}
     ],
     AmountName: "Number of user",
     AmountUnit: "User(s)",
     AmountMin : 1,
     AmountMax : 100,
     AmountStep : 1,
     AmountFree:0,
     AmountFreeCumulative:false,
     RateVar : true,
     RateName:'Plan',
     Rates:{
         'OpenSource project':0,
         'Developer (for one user)':81.6,
         'Team (min 5 users)':104.9,
         'Business Cloud':244.7
     },
     RateUnit:'CHF / Users',
 };
 
 const Bitbucket= {
     Style: "AmountRatesCost",
     Provider : "Bitbucket",
     Name:'BitBucket',
     Url : [
         {Name:'Bitbucket Website Pricing',Url:'https://bitbucket.org/product/pricing'}
     ],
     AmountName: "Number of user",
     AmountUnit: "User(s)",
     AmountMin : 1,
     AmountMax : 100,
     AmountStep : 1,
     AmountFree:0,
     AmountFreeCumulative:false,
     RateVar : true,
     RateName:'Plan',
     Rates:{
         'Free (up to 5 users)':0,
         'Standard for growing teams (min 5 users)':24,
         'Premium for large teams (min 5 users)':60,
     },
     RateUnit:'CHF / Users',
 };
 const Gitlab= {
     Style: "AmountRatesCost",
     Provider : "Gitlab",
     Name:'Gitlab',
     Url : [
         {Name:'Gitlab Website Pricing',Url:'https://about.gitlab.com/pricing/'}
     ],
     AmountName: "Number of user",
     AmountUnit: "User(s)",
     AmountMin : 1,
     AmountMax : 100,
     AmountStep : 1,
     AmountFree:0,
     AmountFreeCumulative:false,
     RateVar : true,
     RateName:'Plan',
     Rates:{
         'Core Self Hosted':0,
         'Free Cloud Based' : 0,
         'Starter Self Hosted':48,
         'Bronze Cloud based':48,
         'Premium Self Hosted':228,
         'Silver Cloud Based':228
     },
     RateUnit:'CHF / Users',
 };
 const Figshare = {
     Style : 'CategoryCost',
     Provider : "FigShare",
     Name:'Figshare',
     Url : [
         {Name:'Figshare website',Url:'https://figshare.com/'},
         {Name:'Figshare Pricing',Url:'https://www.g2crowd.com/products/figshare/pricing'}
     ],
     CatName:'Options',
     Cat:{
         'Free 1GB':0,
         '10GB':96,
         '15GB':132,
         '20GB':180
     },
     CatUnit:'CHF',
 };
 const Dryad = {
     Style : 'CategoryAmountRatesCost',
     Provider : "Dryad",
     Name:'Dyrad',
     Url : [
     {Name:'Dryad Website Pricing',Url:'https://Datadryad.org/pages/payment'}
 ],
     CatName:'Options',
     Cat:{
         'up to 20GB if DPC covered':0,
         'up to 20GB if no  DPC covered':120
     },
     CatUnit:'CHF',
     AmountName: "Extra - Storage",
     AmountUnit: "GB",
     AmountMin : 0,
     AmountMax : 100,
     AmountStep : 10,
     AmountFree:0,
     AmountFreeCumulative:false,
     RateVar : true,
     RateName: 'ELN Storage',
     Rates : {
     'Extra Storage': 50,
     },
     RateUnit : "CHF / GB"
 };
 
 
 
 
 // System variable definition
 // ----------------------------------------------------
 // ----------------------------------------------------
 const NoneSelected={
     Style: 'NoneSelect',
     Provider:'None',
     Name:'Select a Provider',
     Url:'',
 
 };
 
 const UserCostSelect={
     Style : 'UserCost',
     Provider:'Provide your own provider',
     Name:'',
     Url:'',
 };
 
 // Categories definition
 // ----------------------------------------------------
 // ----------------------------------------------------
 const storage={
     Name : 'Active Storage',
     Icon : 'storage.png',
     Url : [
         {Name:'EPFL RDM',Url:'https://researchData.epfl.ch/work-with-Data/storage/'}
     ],
     Intro :'',
     Data :[NoneSelected,
         NasEpfl,
         SwitchEpfl,
         GoogleDriveEdu,
         UserCostSelect,
 
 
     ]
 
 };
 const ELN={
     Name : 'Electronic LabBook',
     Icon : 'eln.png',
     Url : [
         {Name: 'EPFL RDM',Url:'https://researchData.epfl.ch/work-with-Data/active-Data-management/'}
     ],
     Intro :'',
     Data :[NoneSelected,
         SLIMSEpfl,
         UserCostSelect,
     ]
 
 };
 const Database={
     Name : 'Database',
     Icon : 'database.png',
     Url : '',
     Intro :'',
     Data :[NoneSelected,
         MysqlEpfl,
         UserCostSelect,
     ]
 };
 const repository={
         Name : 'Repository',
         Icon : 'repos.png',
         Url : [
             {Name:'EPFL RDM WebPage',Url:'https://researchData.epfl.ch/publish-preserve/'}
         ],
         Intro :'',
         Data :[
             NoneSelected,
             Zenodo,
             C4science,
             Github,
             Bitbucket,
             Gitlab,
             Figshare,
             Dryad,
             UserCostSelect,
         ]
 };
 
 
 // Combine Categories
 // ----------------------------------------------------
 // ----------------------------------------------------
 
 const MainData={
     Updated:'29/11/2018',
     HelpUrl:'mailto:researchdata@epfl.ch',
     Currency:'CHF',
-    Version : 'Beta 2.4',
+    Version : 'v1.1',
     Data:[storage,ELN,Database,repository]
 };