diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index df5fdd1..b67650e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="519d02f1-9909-43c4-95c4-b95f242a05f2" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/queryhandler/__init__.py" afterPath="$PROJECT_DIR$/queryhandler/__init__.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/urlhandler/userpage/templates/activitytext.html" afterPath="$PROJECT_DIR$/urlhandler/userpage/templates/activitytext.html" />
     </list>
     <ignored path="src.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -55,7 +55,7 @@
     <file path="$PROJECT_DIR$/../TuanTuan/TuanTuan/TuanTuan/urls.py" changelist="519d02f1-9909-43c4-95c4-b95f242a05f2" time="1387128133594" ignored="false" />
     <file path="/weixin_lecture.html" changelist="519d02f1-9909-43c4-95c4-b95f242a05f2" time="1387120323102" ignored="false" />
     <file path="$PROJECT_DIR$/../TuanTuan/TuanTuan/TuanTuan/TuanTuanApp/views.py" changelist="519d02f1-9909-43c4-95c4-b95f242a05f2" time="1387128133593" ignored="false" />
-    <file path="/activitytext.html" changelist="519d02f1-9909-43c4-95c4-b95f242a05f2" time="1387815225161" ignored="false" />
+    <file path="/activitytext.html" changelist="519d02f1-9909-43c4-95c4-b95f242a05f2" time="1387816114671" ignored="false" />
     <file path="/activityticket.html" changelist="519d02f1-9909-43c4-95c4-b95f242a05f2" time="1387767289101" ignored="false" />
     <file path="/requirements.txt" changelist="519d02f1-9909-43c4-95c4-b95f242a05f2" time="1387178436418" ignored="false" />
     <file path="/Library/Python/2.7/site-packages/django/db/models/manager.py" changelist="519d02f1-9909-43c4-95c4-b95f242a05f2" time="1387179840678" ignored="false" />
@@ -111,10 +111,28 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="__init__.py" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="__init__.py" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/queryhandler/__init__.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="31" column="12" selection-start="1546" selection-end="1546" vertical-scroll-proportion="0.35885167">
+            <state line="31" column="12" selection-start="1546" selection-end="1546" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="activitydetails.html" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/urlhandler/userpage/templates/activitydetails.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">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="activitytext.html" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/urlhandler/userpage/templates/activitytext.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="179" column="44" selection-start="5686" selection-end="5686" vertical-scroll-proportion="-0.64179105">
               <folding />
             </state>
           </provider>
@@ -151,9 +169,9 @@
         <option value="$PROJECT_DIR$/urlhandler/userpage/templates/help_lecture.html" />
         <option value="$PROJECT_DIR$/urlhandler/userpage/templates/help_club.html" />
         <option value="$PROJECT_DIR$/urlhandler/adminpage/static/js/activity_detail.js" />
-        <option value="$PROJECT_DIR$/urlhandler/userpage/templates/activitytext.html" />
         <option value="$PROJECT_DIR$/queryhandler/tickethandler.py" />
         <option value="$PROJECT_DIR$/queryhandler/__init__.py" />
+        <option value="$PROJECT_DIR$/urlhandler/userpage/templates/activitytext.html" />
       </list>
     </option>
   </component>
@@ -836,14 +854,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/urlhandler/userpage/templates/activitytext.html">
+    <entry file="file://$PROJECT_DIR$/queryhandler/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="180" column="18" selection-start="5693" selection-end="5693" vertical-scroll-proportion="0.70149255">
-          <folding>
-            <element signature="n#style#0;n#div#2;n#div#7;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#9;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#26;n#div#0;n#!!top" expanded="true" />
-          </folding>
+        <state line="31" column="12" selection-start="1546" selection-end="1546" vertical-scroll-proportion="0.0">
+          <folding />
         </state>
       </provider>
     </entry>
@@ -854,9 +868,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/queryhandler/__init__.py">
+    <entry file="file://$PROJECT_DIR$/urlhandler/userpage/templates/activitytext.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="31" column="12" selection-start="1546" selection-end="1546" vertical-scroll-proportion="0.35885167">
+        <state line="179" column="44" selection-start="5686" selection-end="5686" vertical-scroll-proportion="-0.64179105">
           <folding />
         </state>
       </provider>
diff --git a/urlhandler/userpage/templates/activitytext.html b/urlhandler/userpage/templates/activitytext.html
index 12e9f76..5ce0cfc 100644
--- a/urlhandler/userpage/templates/activitytext.html
+++ b/urlhandler/userpage/templates/activitytext.html
@@ -162,7 +162,7 @@
         <div class="text-inner">
             {% include 'activityphoto.html' %}
             <div class="trigger">
-                <span>{{ act_abstract }}</span>
+                <span>{{ act_abstract|linebreaks }}</span>
             </div>
             {% if act_text_status == 1 %}
             <div id="slidedown" class="abstract-wrapper" onclick="slidedown()">
@@ -177,7 +177,7 @@
         <div class="text-inner">
             {% include 'activityphoto.html' %}
             <div class="trigger">
-                <span>{{ act_text }}</span>
+                <span>{{ act_text|linebreaks }}</span>
             </div>
             <!--
             <div id="slideup" class="abstract-wrapper" onclick="slideup()">