--- a/cms/app-client/app/templates/application.hbs	Tue Aug 16 00:16:08 2016 +0200
+++ b/cms/app-client/app/templates/application.hbs	Wed Aug 17 15:30:19 2016 +0200
@@ -7,13 +7,10 @@
     </div>
     {{/if}}
     <div class="corpus-app-container{{if player.window ' window'}}">
-    {{#if player.window}}
-        {{#if (eq player.window 'notice')}}
-            {{ notice-component }}
-        {{/if}}
-        {{#if (eq player.window 'transcript')}}
-            {{ transcript-component }}
-        {{/if}}
+    {{#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 }}
     {{else}}
         {{ outlet }}
     {{/if}}