--- a/cms/app-client/app/templates/application.hbs	Sun Oct 02 19:14:07 2016 +0200
+++ b/cms/app-client/app/templates/application.hbs	Sun Oct 02 20:23:58 2016 +0200
@@ -1,26 +1,31 @@
 {{player-component action="changeDocument" document=currentItem}}
 
 <div class="corpus-window">
+
     {{#if notice}}
     <div class="corpus-app-modal">
         {{ notice-component class="overlay" model=noticeModel }}
     </div>
     {{/if}}
+
     <div class="corpus-app-container{{if player.window ' window'}}">
-    {{#if (if-and player.window (eq player.window 'notice'))}}
-        {{ notice-component }}
-    {{else if (if-and player.window player.transcript (eq player.window 'transcript'))}}
-        {{ transcript-component }}
+    {{#if player.window}}
+        {{#if (eq player.window 'notice')}}
+            {{ notice-component }}
+        {{else if (if-and (eq player.window 'transcript') player.transcript)}}
+            {{ transcript-component }}
+        {{/if}}
     {{else}}
         {{ outlet }}
     {{/if}}
     </div>
+    {{#if player.window}}
+    {{toolbar-component}}
+    {{/if}}
 
     <div class="corpus-app-wrapper">
         {{ filter-component }}
         {{ playlist-component notice=notice model=model }}
     </div>
 
-</div>
-
-{{toolbar-component}}
\ No newline at end of file
+</div>
\ No newline at end of file