--- a/player/index.html	Mon May 27 18:54:46 2013 +0200
+++ b/player/index.html	Tue May 28 12:26:49 2013 +0200
@@ -54,13 +54,6 @@
                     <div class="text-contents"></div>
                 </div>
                 
-                <div class="annotation audio-annotation">
-                    <a href="#" class="close-annotation">&times;</a>
-                    <h2 class="annotation-title"></h2>
-                    <div class="audio-frame"></div>
-                    <div class="audio-description"></div>
-                </div>
-                
                 <div class="annotation link-annotation">
                     <a href="#" class="close-annotation">&times;</a>
                     <h2 class="annotation-title"></h2>
@@ -92,14 +85,21 @@
                         <div class="slideshow-title"></div>
                     </div>
                 </div>
+                
+                <div class="annotation audio-annotation">
+                    <a href="#" class="close-annotation">&times;</a>
+                    <h2 class="annotation-title"></h2>
+                    <div class="media-frame"></div>
+                    <div class="media-description"></div>
+                </div>
 
                 <div class="annotation video-annotation">
                     <a href="#" class="close-annotation">&times;</a>
                     <h2 class="annotation-title"></h2>
                     <div class="video-center">
-                        <div class="video-frame">
+                        <div class="media-frame">
                         </div>
-                        <div class="video-description">
+                        <div class="media-description">
                         </div>
                     </div>
                 </div>