diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 634462d..626e6ad 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="56ba8ed1-8d88-44b6-a1d9-9818bc65c9ae" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rockviewer.wsgi" afterPath="$PROJECT_DIR$/rockviewer.wsgi" />
     </list>
     <ignored path="rockviewer.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -30,16 +31,16 @@
           <file leaf-file-name="rockviewer.wsgi" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/rockviewer.wsgi">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="6" column="27" selection-start="280" selection-end="280" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="204">
+                <state line="4" column="70" selection-start="212" selection-end="212" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="204">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="pressure_temp.html" pinned="false" current="true" current-in-tab="true">
+          <file leaf-file-name="pressure_temp.html" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="52" column="0" selection-start="3853" selection-end="3853" vertical-scroll-proportion="0.8104794" vertical-offset="157" max-vertical-offset="1054">
+                <state line="52" column="0" selection-start="3853" selection-end="3853" vertical-scroll-proportion="-27.961538" vertical-offset="157" max-vertical-offset="1054">
                   <folding />
                 </state>
               </provider>
@@ -49,7 +50,11 @@
             <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html">
               <provider selected="true" editor-type-id="text-editor">
                 <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="731">
-                  <folding />
+                  <folding>
+                    <marker date="1393813347627" expanded="true" signature="136:3047" placeholder="..." />
+                    <marker date="1393813347627" expanded="true" signature="273:2993" placeholder="..." />
+                    <marker date="1393813347627" expanded="true" signature="2785:2989" placeholder="..." />
+                  </folding>
                 </state>
               </provider>
             </entry>
@@ -63,6 +68,15 @@
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="base.html" pinned="false" current="true" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="37" column="23" selection-start="1803" selection-end="1803" vertical-scroll-proportion="0.6447964" vertical-offset="59" max-vertical-offset="1122">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
           <file leaf-file-name="wsgi.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/wsgi.py">
               <provider selected="true" editor-type-id="text-editor">
@@ -81,21 +95,10 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="models.py" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/three_d_viewer/models.py">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="103" column="0" selection-start="3358" selection-end="3358" vertical-scroll-proportion="0.0" vertical-offset="764" max-vertical-offset="2771">
-                  <folding>
-                    <element signature="e#62#90#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
           <file leaf-file-name="base.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://C:/Envs/rockviewer/Lib/site-packages/django/template/base.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="781" column="0" selection-start="28536" selection-end="28536" vertical-scroll-proportion="0.0" vertical-offset="12630" max-vertical-offset="22423">
+                <state line="781" column="0" selection-start="28536" selection-end="28536" vertical-scroll-proportion="0.0" vertical-offset="10080" max-vertical-offset="22423">
                   <folding />
                 </state>
               </provider>
@@ -172,12 +175,12 @@
         <option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/rock_detail.html" />
         <option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html" />
         <option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/fossil_detail.html" />
-        <option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html" />
         <option value="$PROJECT_DIR$/three_d_viewer/models.py" />
         <option value="$PROJECT_DIR$/three_d_viewer/urls.py" />
         <option value="$PROJECT_DIR$/three_d_viewer/views.py" />
-        <option value="$PROJECT_DIR$/rockviewer.wsgi" />
         <option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html" />
+        <option value="$PROJECT_DIR$/rockviewer.wsgi" />
+        <option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html" />
       </list>
     </option>
   </component>
@@ -639,7 +642,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="2576" height="1576" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32944608" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -650,7 +653,7 @@
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39889196" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32825485" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32825485" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -753,6 +756,18 @@
         <state line="76" column="33" selection-start="2287" selection-end="2287" vertical-scroll-proportion="0.0" vertical-offset="1292" max-vertical-offset="2499">
           <folding>
             <element signature="e#62#90#0" expanded="true" />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
           </folding>
         </state>
       </provider>
@@ -833,6 +848,18 @@
         <state line="67" column="0" selection-start="1993" selection-end="1993" vertical-scroll-proportion="0.0" vertical-offset="1139" max-vertical-offset="2193">
           <folding>
             <element signature="e#62#90#0" expanded="true" />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
           </folding>
         </state>
       </provider>
@@ -923,13 +950,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="40" column="80" selection-start="2014" selection-end="2014" vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1122">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/fossil_detail.html">
       <provider selected="true" editor-type-id="text-editor">
         <state line="32" column="39" selection-start="1032" selection-end="1032" vertical-scroll-proportion="0.0" vertical-offset="544" max-vertical-offset="697">
@@ -972,18 +992,23 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/Envs/rockviewer/Lib/site-packages/django/template/base.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="781" column="0" selection-start="28536" selection-end="28536" vertical-scroll-proportion="0.0" vertical-offset="12630" max-vertical-offset="22423">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/three_d_viewer/models.py">
       <provider selected="true" editor-type-id="text-editor">
         <state line="103" column="0" selection-start="3358" selection-end="3358" vertical-scroll-proportion="0.0" vertical-offset="764" max-vertical-offset="2771">
           <folding>
             <element signature="e#62#90#0" expanded="true" />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
           </folding>
         </state>
       </provider>
@@ -1016,23 +1041,41 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rockviewer.wsgi">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="27" selection-start="280" selection-end="280" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="204">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="910">
-          <folding />
+          <folding>
+            <marker date="1393813347627" expanded="true" signature="136:3047" placeholder="..." />
+            <marker date="1393813347627" expanded="true" signature="273:2993" placeholder="..." />
+            <marker date="1393813347627" expanded="true" signature="2785:2989" placeholder="..." />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="52" column="0" selection-start="3853" selection-end="3853" vertical-scroll-proportion="0.8104794" vertical-offset="157" max-vertical-offset="1054">
+        <state line="52" column="0" selection-start="3853" selection-end="3853" vertical-scroll-proportion="-27.961538" vertical-offset="157" max-vertical-offset="1054">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/rockviewer.wsgi">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="4" column="70" selection-start="212" selection-end="212" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="204">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/Envs/rockviewer/Lib/site-packages/django/template/base.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="781" column="0" selection-start="28536" selection-end="28536" vertical-scroll-proportion="0.0" vertical-offset="12630" max-vertical-offset="22423">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="37" column="23" selection-start="1803" selection-end="1803" vertical-scroll-proportion="0.6447964" vertical-offset="59" max-vertical-offset="1122">
           <folding />
         </state>
       </provider>
diff --git a/rockviewer.wsgi b/rockviewer.wsgi
index 9585c11..54d0395 100644
--- a/rockviewer.wsgi
+++ b/rockviewer.wsgi
@@ -2,6 +2,6 @@ import os
 import sys
 # put the Django project on sys.path
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../")))
-os.environ["DJANGO_SETTINGS_MODULE"] = "rockviewer.settings"
+os.environ["DJANGO_SETTINGS_MODULE"] = "rockviewer.settings.production"
 from django.core.handlers.wsgi import WSGIHandler
 application = WSGIHandler()
\ No newline at end of file
diff --git a/three_d_viewer/templates/three_d_viewer/base.html b/three_d_viewer/templates/three_d_viewer/base.html
index aeb7f33..c53274a 100644
--- a/three_d_viewer/templates/three_d_viewer/base.html
+++ b/three_d_viewer/templates/three_d_viewer/base.html
@@ -34,7 +34,7 @@
                         </ul>
                      </li>
                      <li><a href="{% url 'three_d_viewer:minerals_practice' %}"><span>Practice</span></a></li>
-                     <li class='last'><a href="{% url 'three_d_viewer:minerals_selftest' %}"><span>Self Test</span></a></li>
+                     <!--<li class='last'><a href="{% url 'three_d_viewer:minerals_selftest' %}"><span>Self Test</span></a></li>!-->
                   </ul>
                </li>
                <li class="mainitem"><a href="{%  url 'three_d_viewer:rocks_practice' %}"><span>Rocks</span></a></li>