diff --git a/app/views/exercises/_file_form.html.slim b/app/views/exercises/_file_form.html.slim
index 5cdfdc98..c737f068 100644
--- a/app/views/exercises/_file_form.html.slim
+++ b/app/views/exercises/_file_form.html.slim
@@ -4,7 +4,7 @@ li.panel.panel-default
     div.clearfix role="button"
       span = f.object.name
       a.pull-right data-toggle="collapse" data-parent="#files" href="#collapse#{id}" collapse
-  .panel-collapse.collapse id="collapse#{id}" role="tabpanel"
+  .panel-collapse.collapse.in id="collapse#{id}" role="tabpanel"
     .panel-body
       .clearfix = link_to(t('shared.destroy'), '#', class:'btn btn-warning btn-sm discard-file pull-right')
       .form-group
diff --git a/app/views/exercises/implement.html.slim b/app/views/exercises/implement.html.slim
index 728492b6..0c5e109b 100644
--- a/app/views/exercises/implement.html.slim
+++ b/app/views/exercises/implement.html.slim
@@ -78,6 +78,9 @@
           br
           - if session[:lti_parameters].try(:has_key?, 'lis_outcome_service_url')
             p.text-center = render('editor_button', classes: 'btn-lg btn-success', data: {:'data-url' => submit_exercise_path(@exercise)}, icon: 'fa fa-send', id: 'submit', label: t('exercises.editor.submit'))
+          - else
+            p.text-center = render('editor_button', classes: 'btn-lg btn-warning-outline', data: {:'data-placement' => 'bottom', :'data-tooltip' => true} , icon: 'fa fa-clock-o', id: 'submit_outdated', label: t('exercises.editor.exercise_deadline_passed'), title: t('exercises.editor.tooltips.exercise_deadline_passed'))
+
   - if qa_url
     #questions-column
       #questions-holder data-url="#{qa_url}/qa/index/#{@exercise.id}/#{@user_id}"
diff --git a/app/views/exercises/show.html.slim b/app/views/exercises/show.html.slim
index 85fb09cb..fc28272a 100644
--- a/app/views/exercises/show.html.slim
+++ b/app/views/exercises/show.html.slim
@@ -23,13 +23,13 @@ h1
 h2 = t('activerecord.attributes.exercise.files')
 
 ul.list-unstyled.panel-group#files
-  - @exercise.files.order('name').each do |file|
+  - @exercise.files.each do |file|
     li.panel.panel-default
       .panel-heading role="tab" id="heading"
         div.clearfix role="button"
           span.panel-title = file.name_with_extension
           a.pull-right data-toggle="collapse" data-parent="#files" href="#collapse#{file.id}" collapse
-      .panel-collapse.collapse id="collapse#{file.id}" role="tabpanel"
+      .panel-collapse.collapse.in id="collapse#{file.id}" role="tabpanel"
         .panel-body
           - if policy(file).destroy?
             .clearfix = link_to(t('shared.destroy'), file, class:'btn btn-warning btn-sm pull-right', data: {confirm: t('shared.confirm_destroy')}, method: :delete)
diff --git a/config/locales/de.yml b/config/locales/de.yml
index e7d78943..ae7fb930 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -209,8 +209,10 @@ de:
       submit: Code zur Bewertung abgeben
       test: Testen
       timeout: 'Ausführung gestoppt. Ihr Code hat die erlaubte Ausführungszeit von %{permitted_execution_time} Sekunden überschritten.'
+      exercise_deadline_passed: 'Die Abgabefrist für diese Aufgabe ist bereits abgelaufen.'
       tooltips:
         save: Ihr Code wird automatisch gespeichert, wann immer Sie eine Datei herunterladen, ausführen oder testen. Explizites Speichern ist also selten notwendig.
+        exercise_deadline_passed: 'Die hier erzielten Punkte können nur bis zum Ablauf der Abgabefrist an die E-Learning-Plattform übertragen werden.'
       request_for_comments_sent: "Kommentaranfrage gesendet."
     editor_file_tree:
       file_root: Dateien
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f2470fc8..6cc9dcaf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -209,8 +209,10 @@ en:
       submit: Submit Code For Assessment
       test: Test
       timeout: 'Execution stopped. Your code exceeded the permitted execution time of %{permitted_execution_time} seconds.'
+      exercise_deadline_passed: 'The deadline for this exercise has already passed'
       tooltips:
         save: Your code is automatically saved whenever you download, run, or test it. Therefore, explicitly saving is rarely necessary.
+        exercise_deadline_passed: 'The results for this exercise can only be submitted to the e-learning platform before the deadline has passed.'
       request_for_comments_sent: "Request for comments sent."
     editor_file_tree:
       file_root: Files