diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0a46b65..bb61239 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,12 +6,10 @@
     </shared>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9d85cca4-9ab4-4af6-aabc-354276208515" name="Default" comment="Disable the linter on 'MissingTranslation', plus some other things">
+    <list default="true" id="9d85cca4-9ab4-4af6-aabc-354276208515" name="Default" comment="Rework the &quot;Add page&quot; dialog">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/AddActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/AddActivity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/add_activity.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/add_activity.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/PageSaver.java" afterPath="$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/PageSaver.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/SaveService.java" afterPath="$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/SaveService.java" />
     </list>
     <ignored path="save-for-offline.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -45,52 +43,28 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="PageSaver.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="PageSaver.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/PageSaver.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
+            <state relative-caret-position="250">
+              <caret line="580" column="54" selection-start-line="580" selection-start-column="54" selection-end-line="580" selection-end-column="54" />
               <folding>
-                <element signature="imports" expanded="false" />
-                <element signature="e#3403#3404#0" expanded="false" />
-                <element signature="e#3438#3439#0" expanded="false" />
-                <element signature="e#3475#3476#0" expanded="false" />
-                <element signature="e#3508#3509#0" expanded="false" />
-                <element signature="e#4132#4133#0" expanded="false" />
-                <element signature="e#4171#4172#0" expanded="false" />
-                <element signature="e#21311#21312#0" expanded="false" />
-                <element signature="e#21327#21328#0" expanded="false" />
-                <element signature="e#22166#22167#0" expanded="false" />
-                <element signature="e#22206#22207#0" expanded="false" />
-                <element signature="e#22266#22267#0" expanded="false" />
-                <element signature="e#22316#22317#0" expanded="false" />
-                <element signature="e#22362#22363#0" expanded="false" />
-                <element signature="e#22410#22411#0" expanded="false" />
-                <element signature="e#22589#22590#0" expanded="false" />
-                <element signature="e#22630#22631#0" expanded="false" />
-                <element signature="e#22690#22691#0" expanded="false" />
-                <element signature="e#22742#22743#0" expanded="false" />
-                <element signature="e#22781#22782#0" expanded="false" />
-                <element signature="e#22822#22823#0" expanded="false" />
-                <element signature="e#22882#22883#0" expanded="false" />
-                <element signature="e#22934#22935#0" expanded="false" />
-                <element signature="e#22974#22975#0" expanded="false" />
-                <element signature="e#23016#23017#0" expanded="false" />
-                <element signature="e#23078#23079#0" expanded="false" />
-                <element signature="e#23132#23133#0" expanded="false" />
-                <element signature="e#23170#23171#0" expanded="false" />
-                <element signature="e#23210#23211#0" expanded="false" />
-                <element signature="e#23268#23269#0" expanded="false" />
-                <element signature="e#23318#23319#0" expanded="false" />
-                <element signature="e#23356#23357#0" expanded="false" />
-                <element signature="e#23396#23397#0" expanded="false" />
-                <element signature="e#23454#23455#0" expanded="false" />
-                <element signature="e#23504#23505#0" expanded="false" />
+                <element signature="e#0#24077#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="SaveService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/SaveService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="53">
+              <caret line="154" column="0" selection-start-line="154" selection-start-column="0" selection-end-line="154" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="listcell_list_details.xml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/listcell_list_details.xml">
           <provider editor-type-id="android-designer2">
@@ -124,29 +98,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="add_activity.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/add_activity.xml">
-          <provider editor-type-id="android-designer2">
-            <state />
-          </provider>
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="197">
-              <caret line="22" column="126" selection-start-line="22" selection-start-column="126" selection-end-line="22" selection-end-column="126" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="AddActivity.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/AddActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="110" column="147" selection-start-line="110" selection-start-column="147" selection-end-line="110" selection-end-column="147" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="main.xml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main.xml">
           <provider editor-type-id="android-designer2">
@@ -1701,6 +1652,8 @@
         <option value="$PROJECT_DIR$/app/build.gradle" />
         <option value="$PROJECT_DIR$/app/src/main/res/layout/add_activity.xml" />
         <option value="$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/AddActivity.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/SaveService.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/PageSaver.java" />
       </list>
     </option>
   </component>
@@ -1776,6 +1729,28 @@
               <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="save-for-offline" />
+              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="app" />
+              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="saveForOffline" />
+              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PageSaver.java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
       <pane id="Scope" />
@@ -2117,7 +2092,14 @@
       <option name="project" value="LOCAL" />
       <updated>1488472281606</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="Rework the &quot;Add page&quot; dialog">
+      <created>1488478968380</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1488478968382</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="ToolWindowManager">
@@ -2133,7 +2115,7 @@
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39933994" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.47885197" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -2141,7 +2123,7 @@
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32930514" sideWeight="0.5" order="4" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" 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="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -2171,11 +2153,27 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Disable the linter on 'MissingTranslation', plus some other things" />
-    <option name="LAST_COMMIT_MESSAGE" value="Disable the linter on 'MissingTranslation', plus some other things" />
+    <MESSAGE value="Rework the &quot;Add page&quot; dialog" />
+    <option name="LAST_COMMIT_MESSAGE" value="Rework the &quot;Add page&quot; dialog" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
   </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager />
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/PageSaver.java</url>
+          <line>572</line>
+          <properties />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/PageSaver.java</url>
+          <line>576</line>
+          <properties />
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="2" />
+    </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
@@ -2184,41 +2182,7 @@
         <state relative-caret-position="0">
           <caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
           <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#3403#3404#0" expanded="false" />
-            <element signature="e#3438#3439#0" expanded="false" />
-            <element signature="e#3475#3476#0" expanded="false" />
-            <element signature="e#3508#3509#0" expanded="false" />
-            <element signature="e#4132#4133#0" expanded="false" />
-            <element signature="e#4171#4172#0" expanded="false" />
-            <element signature="e#21311#21312#0" expanded="false" />
-            <element signature="e#21327#21328#0" expanded="false" />
-            <element signature="e#22166#22167#0" expanded="false" />
-            <element signature="e#22206#22207#0" expanded="false" />
-            <element signature="e#22266#22267#0" expanded="false" />
-            <element signature="e#22316#22317#0" expanded="false" />
-            <element signature="e#22362#22363#0" expanded="false" />
-            <element signature="e#22410#22411#0" expanded="false" />
-            <element signature="e#22589#22590#0" expanded="false" />
-            <element signature="e#22630#22631#0" expanded="false" />
-            <element signature="e#22690#22691#0" expanded="false" />
-            <element signature="e#22742#22743#0" expanded="false" />
-            <element signature="e#22781#22782#0" expanded="false" />
-            <element signature="e#22822#22823#0" expanded="false" />
-            <element signature="e#22882#22883#0" expanded="false" />
-            <element signature="e#22934#22935#0" expanded="false" />
-            <element signature="e#22974#22975#0" expanded="false" />
-            <element signature="e#23016#23017#0" expanded="false" />
-            <element signature="e#23078#23079#0" expanded="false" />
-            <element signature="e#23132#23133#0" expanded="false" />
-            <element signature="e#23170#23171#0" expanded="false" />
-            <element signature="e#23210#23211#0" expanded="false" />
-            <element signature="e#23268#23269#0" expanded="false" />
-            <element signature="e#23318#23319#0" expanded="false" />
-            <element signature="e#23356#23357#0" expanded="false" />
-            <element signature="e#23396#23397#0" expanded="false" />
-            <element signature="e#23454#23455#0" expanded="false" />
-            <element signature="e#23504#23505#0" expanded="false" />
+            <element signature="e#0#24077#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -2239,41 +2203,7 @@
         <state relative-caret-position="0">
           <caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
           <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#3403#3404#0" expanded="false" />
-            <element signature="e#3438#3439#0" expanded="false" />
-            <element signature="e#3475#3476#0" expanded="false" />
-            <element signature="e#3508#3509#0" expanded="false" />
-            <element signature="e#4132#4133#0" expanded="false" />
-            <element signature="e#4171#4172#0" expanded="false" />
-            <element signature="e#21311#21312#0" expanded="false" />
-            <element signature="e#21327#21328#0" expanded="false" />
-            <element signature="e#22166#22167#0" expanded="false" />
-            <element signature="e#22206#22207#0" expanded="false" />
-            <element signature="e#22266#22267#0" expanded="false" />
-            <element signature="e#22316#22317#0" expanded="false" />
-            <element signature="e#22362#22363#0" expanded="false" />
-            <element signature="e#22410#22411#0" expanded="false" />
-            <element signature="e#22589#22590#0" expanded="false" />
-            <element signature="e#22630#22631#0" expanded="false" />
-            <element signature="e#22690#22691#0" expanded="false" />
-            <element signature="e#22742#22743#0" expanded="false" />
-            <element signature="e#22781#22782#0" expanded="false" />
-            <element signature="e#22822#22823#0" expanded="false" />
-            <element signature="e#22882#22883#0" expanded="false" />
-            <element signature="e#22934#22935#0" expanded="false" />
-            <element signature="e#22974#22975#0" expanded="false" />
-            <element signature="e#23016#23017#0" expanded="false" />
-            <element signature="e#23078#23079#0" expanded="false" />
-            <element signature="e#23132#23133#0" expanded="false" />
-            <element signature="e#23170#23171#0" expanded="false" />
-            <element signature="e#23210#23211#0" expanded="false" />
-            <element signature="e#23268#23269#0" expanded="false" />
-            <element signature="e#23318#23319#0" expanded="false" />
-            <element signature="e#23356#23357#0" expanded="false" />
-            <element signature="e#23396#23397#0" expanded="false" />
-            <element signature="e#23454#23455#0" expanded="false" />
-            <element signature="e#23504#23505#0" expanded="false" />
+            <element signature="e#0#24077#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -2332,41 +2262,7 @@
         <state relative-caret-position="0">
           <caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
           <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#3403#3404#0" expanded="false" />
-            <element signature="e#3438#3439#0" expanded="false" />
-            <element signature="e#3475#3476#0" expanded="false" />
-            <element signature="e#3508#3509#0" expanded="false" />
-            <element signature="e#4132#4133#0" expanded="false" />
-            <element signature="e#4171#4172#0" expanded="false" />
-            <element signature="e#21311#21312#0" expanded="false" />
-            <element signature="e#21327#21328#0" expanded="false" />
-            <element signature="e#22166#22167#0" expanded="false" />
-            <element signature="e#22206#22207#0" expanded="false" />
-            <element signature="e#22266#22267#0" expanded="false" />
-            <element signature="e#22316#22317#0" expanded="false" />
-            <element signature="e#22362#22363#0" expanded="false" />
-            <element signature="e#22410#22411#0" expanded="false" />
-            <element signature="e#22589#22590#0" expanded="false" />
-            <element signature="e#22630#22631#0" expanded="false" />
-            <element signature="e#22690#22691#0" expanded="false" />
-            <element signature="e#22742#22743#0" expanded="false" />
-            <element signature="e#22781#22782#0" expanded="false" />
-            <element signature="e#22822#22823#0" expanded="false" />
-            <element signature="e#22882#22883#0" expanded="false" />
-            <element signature="e#22934#22935#0" expanded="false" />
-            <element signature="e#22974#22975#0" expanded="false" />
-            <element signature="e#23016#23017#0" expanded="false" />
-            <element signature="e#23078#23079#0" expanded="false" />
-            <element signature="e#23132#23133#0" expanded="false" />
-            <element signature="e#23170#23171#0" expanded="false" />
-            <element signature="e#23210#23211#0" expanded="false" />
-            <element signature="e#23268#23269#0" expanded="false" />
-            <element signature="e#23318#23319#0" expanded="false" />
-            <element signature="e#23356#23357#0" expanded="false" />
-            <element signature="e#23396#23397#0" expanded="false" />
-            <element signature="e#23454#23455#0" expanded="false" />
-            <element signature="e#23504#23505#0" expanded="false" />
+            <element signature="e#0#24077#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -2403,41 +2299,7 @@
         <state relative-caret-position="0">
           <caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
           <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#3403#3404#0" expanded="false" />
-            <element signature="e#3438#3439#0" expanded="false" />
-            <element signature="e#3475#3476#0" expanded="false" />
-            <element signature="e#3508#3509#0" expanded="false" />
-            <element signature="e#4132#4133#0" expanded="false" />
-            <element signature="e#4171#4172#0" expanded="false" />
-            <element signature="e#21311#21312#0" expanded="false" />
-            <element signature="e#21327#21328#0" expanded="false" />
-            <element signature="e#22166#22167#0" expanded="false" />
-            <element signature="e#22206#22207#0" expanded="false" />
-            <element signature="e#22266#22267#0" expanded="false" />
-            <element signature="e#22316#22317#0" expanded="false" />
-            <element signature="e#22362#22363#0" expanded="false" />
-            <element signature="e#22410#22411#0" expanded="false" />
-            <element signature="e#22589#22590#0" expanded="false" />
-            <element signature="e#22630#22631#0" expanded="false" />
-            <element signature="e#22690#22691#0" expanded="false" />
-            <element signature="e#22742#22743#0" expanded="false" />
-            <element signature="e#22781#22782#0" expanded="false" />
-            <element signature="e#22822#22823#0" expanded="false" />
-            <element signature="e#22882#22883#0" expanded="false" />
-            <element signature="e#22934#22935#0" expanded="false" />
-            <element signature="e#22974#22975#0" expanded="false" />
-            <element signature="e#23016#23017#0" expanded="false" />
-            <element signature="e#23078#23079#0" expanded="false" />
-            <element signature="e#23132#23133#0" expanded="false" />
-            <element signature="e#23170#23171#0" expanded="false" />
-            <element signature="e#23210#23211#0" expanded="false" />
-            <element signature="e#23268#23269#0" expanded="false" />
-            <element signature="e#23318#23319#0" expanded="false" />
-            <element signature="e#23356#23357#0" expanded="false" />
-            <element signature="e#23396#23397#0" expanded="false" />
-            <element signature="e#23454#23455#0" expanded="false" />
-            <element signature="e#23504#23505#0" expanded="false" />
+            <element signature="e#0#24077#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -2474,41 +2336,7 @@
         <state relative-caret-position="0">
           <caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
           <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#3403#3404#0" expanded="false" />
-            <element signature="e#3438#3439#0" expanded="false" />
-            <element signature="e#3475#3476#0" expanded="false" />
-            <element signature="e#3508#3509#0" expanded="false" />
-            <element signature="e#4132#4133#0" expanded="false" />
-            <element signature="e#4171#4172#0" expanded="false" />
-            <element signature="e#21311#21312#0" expanded="false" />
-            <element signature="e#21327#21328#0" expanded="false" />
-            <element signature="e#22166#22167#0" expanded="false" />
-            <element signature="e#22206#22207#0" expanded="false" />
-            <element signature="e#22266#22267#0" expanded="false" />
-            <element signature="e#22316#22317#0" expanded="false" />
-            <element signature="e#22362#22363#0" expanded="false" />
-            <element signature="e#22410#22411#0" expanded="false" />
-            <element signature="e#22589#22590#0" expanded="false" />
-            <element signature="e#22630#22631#0" expanded="false" />
-            <element signature="e#22690#22691#0" expanded="false" />
-            <element signature="e#22742#22743#0" expanded="false" />
-            <element signature="e#22781#22782#0" expanded="false" />
-            <element signature="e#22822#22823#0" expanded="false" />
-            <element signature="e#22882#22883#0" expanded="false" />
-            <element signature="e#22934#22935#0" expanded="false" />
-            <element signature="e#22974#22975#0" expanded="false" />
-            <element signature="e#23016#23017#0" expanded="false" />
-            <element signature="e#23078#23079#0" expanded="false" />
-            <element signature="e#23132#23133#0" expanded="false" />
-            <element signature="e#23170#23171#0" expanded="false" />
-            <element signature="e#23210#23211#0" expanded="false" />
-            <element signature="e#23268#23269#0" expanded="false" />
-            <element signature="e#23318#23319#0" expanded="false" />
-            <element signature="e#23356#23357#0" expanded="false" />
-            <element signature="e#23396#23397#0" expanded="false" />
-            <element signature="e#23454#23455#0" expanded="false" />
-            <element signature="e#23504#23505#0" expanded="false" />
+            <element signature="e#0#24077#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -2523,50 +2351,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/PageSaver.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#3403#3404#0" expanded="false" />
-            <element signature="e#3438#3439#0" expanded="false" />
-            <element signature="e#3475#3476#0" expanded="false" />
-            <element signature="e#3508#3509#0" expanded="false" />
-            <element signature="e#4132#4133#0" expanded="false" />
-            <element signature="e#4171#4172#0" expanded="false" />
-            <element signature="e#21311#21312#0" expanded="false" />
-            <element signature="e#21327#21328#0" expanded="false" />
-            <element signature="e#22166#22167#0" expanded="false" />
-            <element signature="e#22206#22207#0" expanded="false" />
-            <element signature="e#22266#22267#0" expanded="false" />
-            <element signature="e#22316#22317#0" expanded="false" />
-            <element signature="e#22362#22363#0" expanded="false" />
-            <element signature="e#22410#22411#0" expanded="false" />
-            <element signature="e#22589#22590#0" expanded="false" />
-            <element signature="e#22630#22631#0" expanded="false" />
-            <element signature="e#22690#22691#0" expanded="false" />
-            <element signature="e#22742#22743#0" expanded="false" />
-            <element signature="e#22781#22782#0" expanded="false" />
-            <element signature="e#22822#22823#0" expanded="false" />
-            <element signature="e#22882#22883#0" expanded="false" />
-            <element signature="e#22934#22935#0" expanded="false" />
-            <element signature="e#22974#22975#0" expanded="false" />
-            <element signature="e#23016#23017#0" expanded="false" />
-            <element signature="e#23078#23079#0" expanded="false" />
-            <element signature="e#23132#23133#0" expanded="false" />
-            <element signature="e#23170#23171#0" expanded="false" />
-            <element signature="e#23210#23211#0" expanded="false" />
-            <element signature="e#23268#23269#0" expanded="false" />
-            <element signature="e#23318#23319#0" expanded="false" />
-            <element signature="e#23356#23357#0" expanded="false" />
-            <element signature="e#23396#23397#0" expanded="false" />
-            <element signature="e#23454#23455#0" expanded="false" />
-            <element signature="e#23504#23505#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/listcell_list_details.xml">
       <provider editor-type-id="android-designer2">
         <state />
@@ -2594,14 +2378,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/build.gradle">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="22" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main.xml">
       <provider editor-type-id="android-designer2">
         <state />
@@ -2613,6 +2389,14 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/AddActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="110" column="147" selection-start-line="110" selection-start-column="147" selection-end-line="110" selection-end-column="147" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/add_activity.xml">
       <provider editor-type-id="android-designer2">
         <state />
@@ -2624,13 +2408,31 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/AddActivity.java">
+    <entry file="file://$PROJECT_DIR$/app/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="110" column="147" selection-start-line="110" selection-start-column="147" selection-end-line="110" selection-end-column="147" />
+        <state relative-caret-position="150">
+          <caret line="10" column="22" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/SaveService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="53">
+          <caret line="154" column="0" selection-start-line="154" selection-start-column="0" selection-end-line="154" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/jonas/tool/saveForOffline/PageSaver.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="580" column="54" selection-start-line="580" selection-start-column="54" selection-end-line="580" selection-end-column="54" />
+          <folding>
+            <element signature="e#0#24077#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/jonas/tool/saveForOffline/PageSaver.java b/app/src/main/java/jonas/tool/saveForOffline/PageSaver.java
index de15c65..82a0279 100644
--- a/app/src/main/java/jonas/tool/saveForOffline/PageSaver.java
+++ b/app/src/main/java/jonas/tool/saveForOffline/PageSaver.java
@@ -574,10 +574,12 @@ private String getFileName(String url) {
 		}
 
         if (filename.contains("?")) {
-            filename = filename.substring(0, filename.indexOf("?"));
+            filename = filename.substring(0, filename.indexOf("?")) + filename.substring(filename.indexOf("?") + 1).hashCode();
         }
 
         filename = fileNameReplacementPattern.matcher(filename).replaceAll("_");
+        filename = filename.substring(0, Math.min(200, filename.length()));
+        ;
 
         return filename;
     }
diff --git a/app/src/main/java/jonas/tool/saveForOffline/SaveService.java b/app/src/main/java/jonas/tool/saveForOffline/SaveService.java
index 07efe9e..3a9659c 100644
--- a/app/src/main/java/jonas/tool/saveForOffline/SaveService.java
+++ b/app/src/main/java/jonas/tool/saveForOffline/SaveService.java
@@ -152,7 +152,7 @@ public void run() {
 
 				notificationTools.notifyFinished(pageSaver.getPageTitle(), newSavedPageDirectory.getPath());
 			} catch (Exception e) {  //so that exceptions don't fpget swallowed and we see them.
-				Toast.makeText(SaveService.this, "SaveService Exception: " + e.getMessage(), Toast.LENGTH_LONG);
+				Toast.makeText(SaveService.this, "SaveService Exception: " + e.getMessage(), Toast.LENGTH_LONG).show();
 				e.printStackTrace();
 			}
 		}