diff --git a/generate.py b/generate.py
index 0c60264..c8742d6 100755
--- a/generate.py
+++ b/generate.py
@@ -108,6 +108,7 @@ def get_author_str(authors):
         print(t)
         raise Exception()
       gidx += 1
+    details = re.sub("<br><br>\n$", '', details)
     type_content['details'] = details
     contents.append(type_content)
 
diff --git a/tmpl/cv-section.tmpl.md b/tmpl/cv-section.tmpl.md
index 334f589..6fae797 100644
--- a/tmpl/cv-section.tmpl.md
+++ b/tmpl/cv-section.tmpl.md
@@ -1,3 +1,4 @@
+
 # ~{{name}}~
 
 ~{ if name == "Education" }~
@@ -19,30 +20,68 @@ GPA: ~{{school.overallGPA}}~
   ~{{ n.dates }}~.
 ~{- endfor }~
 ~{ elif name.endswith("Experience") }~
-~{ for n in contents }~
 
-__<big>~{{n.place}}~.</big>__  ~{{n.title}}~.
+<div class="panel-group" id="accordion" role="tablist"
+     aria-multiselectable="true">
+
+  ~{ for n in contents }~
+  <div class="panel panel-default">
+    <div class="panel-heading"
+         role="tab" id="~{{name[0]}}~heading~{{loop.index}}~">
+      <h4 class="panel-title">
+        <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#~{{name[0]}}~collapse~{{loop.index}}~" aria-expanded="false" aria-controls="~{{name[0]}}~collapse~{{loop.index}}~">
+          <b>~{{n.place}}~</b>: ~{{n.title}}~
+        </a>
+      </h4>
+    </div>
+    <div id="~{{name[0]}}~collapse~{{loop.index}}~" class="panel-collapse collapse" role="tabpanel" aria-labelledby="~{{name[0]}}~heading~{{loop.index}}~">
+
+<div class="panel-body" markdown="1">
 
 + ~{{n.location}}~
 ~{ if n.advisor -}~
-  &#124; Advisor: ~{{n.advisor}}~
+&#124; Advisor: ~{{n.advisor}}~
 ~{ endif -}~
 &#124; ~{{n.dates}}~
 ~{- if n.details -}~
 ~{- for detail in n.details }~
 + ~{{detail}}~
 ~{- endfor }~
-~{- endif -}~
-~{ endfor }~
+~{ endif }~
+
+</div>
+</div>
+</div>
+  ~{ endfor }~
+</div>
 
 ~{ elif name == "Publications" }~
-~{ for type in contents }~
 
-__<big>~{{type['title']}}~.</big>__
+
+<div class="panel-group" id="accordion" role="tablist"
+     aria-multiselectable="true">
+
+  ~{ for type in contents }~
+  <div class="panel panel-default">
+    <div class="panel-heading"
+         role="tab" id="pub-heading~{{loop.index}}~">
+      <h4 class="panel-title">
+        <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#pub-collapse~{{loop.index}}~" aria-expanded="false" aria-controls="pub-collapse~{{loop.index}}~">
+          <b>~{{type['title']}}~.</b>
+        </a>
+      </h4>
+    </div>
+    <div id="pub-collapse~{{loop.index}}~" class="panel-collapse collapse" role="tabpanel" aria-labelledby="pub-heading~{{loop.index}}~">
+
+<div class="panel-body" markdown="1">
 
 ~{{type['details']}}~
 
-~{ endfor }~
+</div>
+</div>
+</div>
+  ~{ endfor }~
+</div>
 
 ~{ elif name == "Honors \\& Awards" or name == "Honors & Awards" }~
 ~{- for award in contents }~
@@ -79,4 +118,3 @@ __<big>~{{type['title']}}~.</big>__
 ~{ else }~
 ~{{contents}}~
 ~{ endif }~
-