diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 96b66296c00889cbeec66437c9be697a91930beb..2bc5ec3dec5a8d50e62a107bd5c34792e7ccfc9e 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -1,6 +1,8 @@
 class JournalsController < ApplicationController
+  before_action :set_semester_process_volunteer
   before_action :set_journaled
   before_action :set_journal, only: [:edit, :update, :destroy]
+  before_action :set_form_url, only: [:edit, :new]
 
   def index
     authorize Journal
@@ -10,7 +12,7 @@ class JournalsController < ApplicationController
   end
 
   def new
-    @journal = Journal.new
+    @journal = Journal.new(user: current_user)
     handle_semester_feedback_quote
     authorize @journal
   end
@@ -23,7 +25,7 @@ class JournalsController < ApplicationController
     @journal.journalable = @journaled
     authorize @journal
     if @journal.save
-      redirect_to [@journaled, Journal], make_notice
+      redirect_to redirect_back_path, make_notice
     else
       render :new
     end
@@ -31,7 +33,7 @@ class JournalsController < ApplicationController
 
   def update
     if @journal.update(journal_params)
-      redirect_to [@journaled, Journal], make_notice
+      redirect_to redirect_back_path, make_notice
     else
       render :edit
     end
@@ -39,43 +41,65 @@ class JournalsController < ApplicationController
 
   def destroy
     @journal.destroy
-    redirect_to [@journaled, Journal], make_notice
+    redirect_to redirect_back_path, make_notice
   end
 
   private
 
+  def set_form_url
+    @form_url = if @sp_volunteer
+      polymorphic_path([@sp_volunteer, :journals])
+    else
+      polymorphic_path([@journaled, :journals])
+    end
+  end
+
+  def redirect_back_path
+    if @sp_volunteer
+      semester_process_volunteers_path
+    else
+      [@journaled, Journal]
+    end
+  end
+
   def set_journal
     @journal = Journal.find_by(id: params[:id])
     if @journal
       authorize @journal
     else
-      redirect_to @journaled, notice: t('crud.c_action.destroy', model: t_model)
+      redirect_to @sp_volunteer || @journaled, notice: t('crud.c_action.destroy', model: t_model)
     end
   end
 
   def set_journaled
-    return @journaled = Client.find(params[:client_id]) if params[:client_id]
-    @journaled = Volunteer.find(params[:volunteer_id])
+    @journaled = if @sp_volunteer
+      @sp_volunteer.volunteer
+    elsif params[:client_id]
+      Client.find(params[:client_id])
+    elsif params[:volunteer_id]
+      Volunteer.find(params[:volunteer_id])
+    end
+  end
+
+  def set_semester_process_volunteer
+    return unless params[:semester_process_volunteer_id]
+
+    @sp_volunteer = SemesterProcessVolunteer.find(params[:semester_process_volunteer_id])
   end
 
   def handle_semester_feedback_quote
-    return unless params[:sp_volunteer_id]
-
-    @journal.category = :feedback
-    @semester_process_volunteer = SemesterProcessVolunteer.find(params[:sp_volunteer_id])
-    @journal.journalable = @semester_process_volunteer.volunteer
-    @journal.title = "Semester Prozess Feedback vom #{I18n.l(@semester_process_volunteer.created_at.to_date)}: "
-    @semester_feedback = @semester_process_volunteer.semester_feedbacks&.first
-    return unless @semester_feedback
-
-    @journal.body = @semester_feedback.slice(:goals, :achievements, :future, :comments).map do |key, sfb_quote|
-      "#{I18n.t("activerecord.attributes.feedback.#{key}")}:\n«#{sfb_quote}»" if sfb_quote.present?
-    end.compact.join("\n\n")
+    return unless @sp_volunteer
+
+    @journal.assign_attributes(
+      category: :feedback, journalable: @journaled,
+      title: "Semester Prozess Feedback vom #{I18n.l(@sp_volunteer.created_at.to_date)}: ",
+      body: render_to_string('journal_body', layout: false)
+    )
   end
 
   def journal_params
     params.require(:journal).permit(
-      :category, :user_id, :body, :title, :client_id, :volunteer_id
+      :category, :user_id, :body, :title, :client_id, :volunteer_id, :semester_process_volunteer_id
     )
   end
 end
diff --git a/app/controllers/review_semesters_controller.rb b/app/controllers/review_semesters_controller.rb
index c3c817c7338ed82842f948d32cbc4d898cdfdb96..27ce082e3cf83369fdb65c52a8356777d1930a6e 100644
--- a/app/controllers/review_semesters_controller.rb
+++ b/app/controllers/review_semesters_controller.rb
@@ -1,21 +1,19 @@
 class ReviewSemestersController < ApplicationController
-  before_action :prepare_review, :initialize_nested_objects, only: [:review_semester, :submit_review]
-
-  include ReviewSemesterHelper, SemesterProcessVolunteerHelper
+  before_action :set_sp_volunteer, :initialize_nested_objects,
+    only: [:review_semester, :submit_review]
 
   def review_semester; end
 
   def submit_review
     # you shall not pass
-    return if @semester_process_volunteer.commited_at
+    return if @sp_volunteer.commited_at
 
-    set_reviewed
-    assign_volunteer_attributes
+    @sp_volunteer.set_comitted(current_user)
+    @sp_volunteer.volunteer.assign_attributes(review_params[:volunteer_attributes].slice(:waive, :bank, :iban))
     build_nested_objects
 
     if save_feedback_data!
-      create_journals
-      redirect_to review_semester_review_semester_url(@semester_process_volunteer), notice: t('.success')
+      redirect_to review_semester_review_semester_url(@sp_volunteer), notice: t('.success')
     else
       render :review_semester
     end
@@ -23,11 +21,69 @@ class ReviewSemestersController < ApplicationController
 
   private
 
+  def build_nested_objects
+    review_params[:semester_feedbacks_attributes].each do |_key, hash|
+      spv_mission = SemesterProcessVolunteerMission.find(hash[:semester_feedback][:spv_mission_id])
+      @nested_objects[spv_mission.id.to_s][:feedback] = SemesterFeedback.new(
+        hash[:semester_feedback].merge(author: current_user, semester_process_volunteer: @sp_volunteer)
+      )
+      next unless hash[:hour][:hours].to_i.positive?
+
+      @nested_objects[spv_mission.id.to_s][:hours] = Hour.new(
+        hash[:hour].merge(volunteer: spv_mission.volunteer,
+          meeting_date: spv_mission.semester_process_volunteer.semester.last.to_date,
+          hourable: spv_mission.mission.group_assignment? ? spv_mission.mission.group_offer : spv_mission.mission)
+      )
+    end
+  end
+
+  def save_feedback_data!
+    @sp_volunteer.volunteer.validate_waive_and_bank = true
+
+    ActiveRecord::Base.transaction do
+      @sp_volunteer.save!
+      @volunteer.save!
+
+      @nested_objects.values.each do |missions|
+        missions.values.map(&:save!)
+      end
+    end
+    # reload the variable
+    @sp_volunteer.reload
+    true
+  rescue ActiveRecord::RecordInvalid => exception
+    @sp_volunteer.reset_comitted
+    flash[:alert] = exception.message
+    false
+  end
+
+  def set_sp_volunteer
+    @sp_volunteer = SemesterProcessVolunteer.find(params[:id])
+    authorize @sp_volunteer
+    @volunteer = @sp_volunteer.volunteer
+  end
+
+  def initialize_nested_objects
+    @nested_objects = @sp_volunteer.semester_process_volunteer_missions.map do |spvm|
+      [spvm.id.to_s, { feedback: @sp_volunteer.semester_feedback_with_mission(spvm.mission) || SemesterFeedback.new }]
+    end.to_h
+  end
+
   def review_params
     params.require(:semester_process_volunteer).permit(
       volunteer_attributes: [:id, :waive, :iban, :bank],
-      semester_feedbacks_attributes: [[semester_feedback: [:mission, :goals, :achievements, :future, :comments, :conversation, :spv_mission_id]],
-                                     [hour: [:hours, :spv_mission_id, :activity]]]
+      semester_feedbacks_attributes: [
+        [
+          semester_feedback: [
+            :mission, :goals, :achievements, :future, :comments, :conversation, :spv_mission_id
+          ]
+        ],
+        [
+          hour: [
+            :hours, :spv_mission_id, :activity
+          ]
+        ]
+      ]
     )
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/semester_process_volunteers_controller.rb b/app/controllers/semester_process_volunteers_controller.rb
index b700b3418f7e59f1579657fadd813f4615077719..b3c076a916bbdb04ecbd0fd9c5a4c7ef8099c8c3 100644
--- a/app/controllers/semester_process_volunteers_controller.rb
+++ b/app/controllers/semester_process_volunteers_controller.rb
@@ -2,8 +2,6 @@ class SemesterProcessVolunteersController < ApplicationController
   before_action :set_semester_process_volunteer, only: [:show, :edit, :update, :take_responsibility, :mark_as_done, :update_notes]
   before_action :set_semester, only: [:index]
 
-  include SemesterProcessVolunteerHelper
-
   def review_semester
     authorize SemesterProcessVolunteer.find(params[:id])
     redirect_to review_semester_review_semester_url params[:id]
@@ -80,6 +78,39 @@ class SemesterProcessVolunteersController < ApplicationController
     end
   end
 
+  def set_semester_process_volunteer
+    @spv = SemesterProcessVolunteer.find(params[:id])
+    authorize @spv
+    @semester_process = @spv.semester_process
+    @volunteer = @spv.volunteer
+  end
+
+  def set_responsibles
+    @responsibles = SemesterProcessVolunteer.joins(responsible: [profile: [:contact]])
+      .distinct
+      .select('users.id, contacts.full_name')
+      .map do |responsible|
+        {
+          q: :responsible_id_eq,
+          text: "Übernommen von #{responsible.full_name}",
+          value: responsible.id
+        }
+      end
+  end
+
+  def set_reviewers
+    @reviewers = SemesterProcessVolunteer.joins(reviewed_by: [profile: [:contact]])
+      .distinct
+      .select('users.id, contacts.full_name')
+      .map do |reviewed_by|
+        {
+          q: :reviewed_by_id_eq,
+          text: "Quittiert von #{reviewed_by.full_name}",
+          value: reviewed_by.id
+        }
+      end
+  end
+
   def semester_process_volunteer_params
     params.require(:semester_process_volunteer).permit(:semester, :notes)
   end
diff --git a/app/helpers/review_semester_helper.rb b/app/helpers/review_semester_helper.rb
deleted file mode 100644
index 563bbc5bc45e39da562a39e881bb8fdeb601cd83..0000000000000000000000000000000000000000
--- a/app/helpers/review_semester_helper.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-module ReviewSemesterHelper
-  def initialize_nested_objects
-    @nested_objects = {}
-    @semester_process_volunteer.semester_process_volunteer_missions.each do |spvm|
-      @nested_objects[spvm.id.to_s] = { feedback: @semester_process_volunteer.semester_feedback_with_mission(spvm.mission) || SemesterFeedback.new }
-    end
-    @nested_objects
-  end
-
-  def set_reviewed
-    @semester_process_volunteer.commited_by = current_user
-    @semester_process_volunteer.commited_at = Time.zone.now
-  end
-
-  def assign_volunteer_attributes
-    @volunteer.assign_attributes(review_params[:volunteer_attributes]
-      .slice(:waive, :bank, :iban))
-  end
-
-  def build_nested_objects
-    review_params[:semester_feedbacks_attributes].each do |_key, hash|
-      spv_mission = SemesterProcessVolunteerMission.find(hash[:semester_feedback][:spv_mission_id])
-      @nested_objects[spv_mission.id.to_s][:feedback] = SemesterFeedback.new(hash[:semester_feedback].merge({
-        author: current_user, semester_process_volunteer: @semester_process_volunteer
-      }))
-
-      if hash[:hour][:hours].to_i.positive?
-        @nested_objects[spv_mission.id.to_s][:hours] = Hour.new(hash[:hour].merge({
-          volunteer: spv_mission.volunteer,
-          meeting_date: spv_mission.semester_process_volunteer.semester.last.to_date,
-          hourable: spv_mission.mission.group_assignment? ? spv_mission.mission.group_offer : spv_mission.mission
-        }))
-      end
-    end
-  end
-
-  def null_reviewed
-    @semester_process_volunteer.commited_by = nil
-    @semester_process_volunteer.commited_at = nil
-  end
-
-  def save_feedback_data!
-    @semester_process_volunteer.volunteer.validate_waive_and_bank = true
-
-    ActiveRecord::Base.transaction do
-      @semester_process_volunteer.save!
-      @volunteer.save!
-
-      @nested_objects.each do |_key, hash|
-        hash.each { |_id, obj| obj.save! }
-      end
-    end
-    # reload the variable
-    @semester_process_volunteer.reload
-    true
-  rescue ActiveRecord::RecordInvalid => exception
-    null_reviewed
-    flash[:alert] = exception.message
-    false
-  end
-
-  def create_journals
-    spv = @semester_process_volunteer
-    return unless spv.commited_at?
-    volunteer = spv.volunteer
-    semester_feedbacks = spv.semester_feedbacks
-    Journal.create(user: volunteer.user, journalable: volunteer,
-      category: :feedback, title: "Semester Prozess Feedback vom #{I18n.l(Time.zone.today)}: ",
-      body: render_semester_feedbacks(semester_feedbacks))
-  end
-
-  def prepare_review
-    @semester_process_volunteer = SemesterProcessVolunteer.find(params[:id])
-    authorize @semester_process_volunteer
-    @volunteer = @semester_process_volunteer.volunteer
-    @missions = @semester_process_volunteer.missions
-  end
-end
\ No newline at end of file
diff --git a/app/helpers/semester_process_volunteer_helper.rb b/app/helpers/semester_process_volunteer_helper.rb
deleted file mode 100644
index 8bba7631f6e3937e1b012c4b82b71920029fe519..0000000000000000000000000000000000000000
--- a/app/helpers/semester_process_volunteer_helper.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-module SemesterProcessVolunteerHelper
-  def render_semester_feedbacks(semester_feedbacks)
-    text = ''
-    semester_feedbacks.each do |semester_feedback|
-      text += semester_feedback.mission.to_label
-      text += "\n\n"
-      text += semester_feedback.slice(:goals, :achievements, :future, :comments).map do |key, sfb_quote|
-                "#{I18n.t("activerecord.attributes.feedback.#{key}")}:\n«#{sfb_quote}»" if sfb_quote.present?
-              end.compact.join("\n\n")
-      text += "\n\n"
-    end
-    text
-  end
-
-  def assign_volunteer_attributes
-    @volunteer.assign_attributes(review_params[:volunteer_attributes]
-      .slice(:waive, :bank, :iban))
-  end
-
-  def render_missions(spv)
-    html = ""
-    spv.missions.each do |m|
-      html += link_to m.to_label, "/#{m.class.name.underscore.pluralize}/#{m.id}/edit", target: '_blank'
-      html += "<br>"
-    end
-    html.html_safe
-  end
-
-  def set_responsibles
-    @responsibles = SemesterProcessVolunteer.joins(responsible: [profile: [:contact]])
-      .distinct
-      .select('users.id, contacts.full_name')
-      .map do |responsible|
-        {
-          q: :responsible_id_eq,
-          text: "Übernommen von #{responsible.full_name}",
-          value: responsible.id
-        }
-      end
-  end
-
-  def set_reviewers
-    @reviewers = SemesterProcessVolunteer.joins(reviewed_by: [profile: [:contact]])
-      .distinct
-      .select('users.id, contacts.full_name')
-      .map do |reviewed_by|
-        {
-          q: :reviewed_by_id_eq,
-          text: "Quittiert von #{reviewed_by.full_name}",
-          value: reviewed_by.id
-        }
-      end
-  end
-
-  def set_semester_process_volunteer
-    @spv = SemesterProcessVolunteer.find(params[:id])
-    authorize @spv
-    @semester_process = @spv.semester_process
-    @volunteer = @spv.volunteer
-  end
-end
diff --git a/app/models/journal.rb b/app/models/journal.rb
index ceeeb3f454971bb8713122ed006b8141aaaf62aa..f36c7212845b406358ee658f2f2cb30f29f8e051 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -1,11 +1,6 @@
 class Journal < ApplicationRecord
   include ImportRelation
 
-  belongs_to :user, -> { with_deleted }, inverse_of: 'journals'
-  belongs_to :assignment, optional: true
-
-  belongs_to :journalable, polymorphic: true, required: false
-
   CATEGORIES = [
     :telephone,
     :conversation,
@@ -15,6 +10,13 @@ class Journal < ApplicationRecord
     :group_offer
   ].freeze
 
+  belongs_to :user, -> { with_deleted }, inverse_of: 'journals'
+  belongs_to :assignment, optional: true
+  belongs_to :journalable, polymorphic: true, required: false
+
+  validates :category, presence: true
+  validate :user_role_validation
+
   def self.categories_filters
     CATEGORIES.map do |category|
       {
@@ -25,5 +27,9 @@ class Journal < ApplicationRecord
     end
   end
 
-  validates :category, presence: true
+  private
+
+  def user_role_validation
+    errors.add(:user, :no_volunteer) if user.volunteer?
+  end
 end
diff --git a/app/models/semester_process_volunteer.rb b/app/models/semester_process_volunteer.rb
index 338e68814f28542f7c2634791d6e30f81346f673..213ea542194a0b4c7c9e67164f3eebdb15e586cc 100644
--- a/app/models/semester_process_volunteer.rb
+++ b/app/models/semester_process_volunteer.rb
@@ -64,18 +64,26 @@ class SemesterProcessVolunteer < ApplicationRecord
   attr_accessor :hours
 
   def hours
-    missions.map do |m|
-      m.hours.within_semester(semester)
-    end.flatten
+    scope = Hour.within_semester(semester).where(volunteer: volunteer)
+    scope.where(hourable_type: 'Assignment', hourable_id: assignment_ids).or(
+      scope.where(hourable_type: 'GroupOffer', hourable_id: group_offer_ids)
+    )
   end
 
   def semester_feedback_with_mission(mission)
-    semester_feedbacks.order(:created_at).select { |sf| sf.mission == mission }.last
+    scope = semester_feedbacks.order(:created_at)
+    scope.where(group_assignment: mission).or(
+      scope.where(assignment: mission)
+    ).last
   end
 
   # will only return an array, not a AD-result
   def missions
-    semester_process_volunteer_missions.map(&:mission)
+    if new_record?
+      Assignment.find(assignment_ids) + GroupAssignment.find(group_assignment_ids)
+    else
+      assignments + group_assignments
+    end
   end
 
   def build_missions(semester)
@@ -112,4 +120,40 @@ class SemesterProcessVolunteer < ApplicationRecord
     self.responsibility_taken_at = Time.zone.now
     super(responsible_user)
   end
+
+  def set_comitted(user)
+    self.commited_by = user
+    self.commited_at = Time.zone.now
+  end
+
+  def reset_comitted
+    self.commited_by = nil
+    self.commited_at = nil
+  end
+
+  private
+
+  def group_assignment_ids
+    if new_record?
+      semester_process_volunteer_missions.map(&:group_assignment_id).compact
+    else
+      group_assignments.ids
+    end
+  end
+
+  def group_offer_ids
+    if new_record?
+      GroupAssignment.find(group_assignment_ids).pluck(:group_offer_id)
+    else
+      group_assignments.pluck(:group_offer_id)
+    end
+  end
+
+  def assignment_ids
+    if new_record?
+      semester_process_volunteer_missions.map(&:assignment_id).compact
+    else
+      assignments.ids
+    end
+  end
 end
diff --git a/app/views/journals/_form.html.slim b/app/views/journals/_form.html.slim
index f990197205d5741464b7997c4129db3d1264bd6e..b21af6503ee6d23bf554ff781af08a6711a28f92 100644
--- a/app/views/journals/_form.html.slim
+++ b/app/views/journals/_form.html.slim
@@ -1,4 +1,4 @@
-= simple_form_for [@journaled, @journal] do |f|
+= simple_form_for [@journaled, @journal], url: @form_url do |f|
   = simple_error_notice f
   h1= @journaled.contact.full_name
   .row
diff --git a/app/views/journals/journal_body.erb b/app/views/journals/journal_body.erb
new file mode 100644
index 0000000000000000000000000000000000000000..add69418291c36a7287c1930ec0764962072b6b0
--- /dev/null
+++ b/app/views/journals/journal_body.erb
@@ -0,0 +1,10 @@
+<% @sp_volunteer.semester_feedbacks.each do |feedback| %>
+<%= feedback.mission.to_label %>
+
+<% feedback.slice(:goals, :achievements, :future, :comments).compact.map do |key, sfb_quote| %>
+<%= t("activerecord.attributes.feedback.#{key}") %>:
+<%= "«#{sfb_quote}»" %>
+
+<% end %>
+
+<% end %>
diff --git a/app/views/review_semesters/review_semester.html.slim b/app/views/review_semesters/review_semester.html.slim
index 7e8b843b54a78ed32d35afda2e8f68c250d105fc..5c12831c9c7f3021fbe9d3cd181b20dfdcc4bc87 100644
--- a/app/views/review_semesters/review_semester.html.slim
+++ b/app/views/review_semesters/review_semester.html.slim
@@ -1,14 +1,14 @@
-- disabled = @semester_process_volunteer.commited_at.present?
-= simple_form_for(@semester_process_volunteer, html: { class: 'col-xs-12 '},
-  url: submit_review_review_semester_path(@semester_process_volunteer)) do |f|
+- disabled = @sp_volunteer.commited_at.present?
+= simple_form_for(@sp_volunteer, html: { class: 'col-xs-12 '},
+  url: submit_review_review_semester_path(@sp_volunteer)) do |f|
   = simple_error_notice f
-  h1 Halbjahres-Rapporte #{@semester_process_volunteer.semester_t} für #{@semester_process_volunteer.volunteer.contact.full_name}
+  h1 Halbjahres-Rapporte #{@sp_volunteer.semester_t} für #{@sp_volunteer.volunteer.contact.full_name}
   - if disabled
     .submit-box
       .col-xs-12
-        p.text-danger Bestätigt am #{l(@semester_process_volunteer.commited_at.to_date)} durch #{profile_link(@semester_process_volunteer.commited_by)}
+        p.text-danger Bestätigt am #{l(@sp_volunteer.commited_at.to_date)} durch #{profile_link(@sp_volunteer.commited_by)}
 
-  = f.simple_fields_for :semester_feedbacks, @semester_process_volunteer.semester_process_volunteer_missions.need_feedback do |spvm|
+  = f.simple_fields_for :semester_feedbacks, @sp_volunteer.semester_process_volunteer_missions.need_feedback do |spvm|
     - mission = spvm.object.mission
     h2.m-b-20.m-t-30 Einsatz #{mission.to_label}
 
@@ -18,13 +18,13 @@
         .row
           .col-xs-12= ff.input field, disabled: disabled
 
-    - if mission.hours.within_semester(@semester_process_volunteer.semester).any?
+    - if mission.hours.within_semester(@sp_volunteer.semester).any?
         h3 Stunden
-        = render 'hours/last_submitted_hours', hours: mission.hours.within_semester(@semester_process_volunteer.semester)
+        = render 'hours/last_submitted_hours', hours: mission.hours.within_semester(@sp_volunteer.semester)
 
     = spvm.simple_fields_for :hour, Hour.new do |hf|
       = hf.input :spv_mission_id, as: :hidden, input_html: { value: spvm.object.id}
-      h4.m-b-20.m-t-20= "Restliche Stunden in diesem Semester (#{@semester_process_volunteer.semester_period})"
+      h4.m-b-20.m-t-20= "Restliche Stunden in diesem Semester (#{@sp_volunteer.semester_period})"
       .row
         .col-xs-2= hf.input :hours, label: 'Stunden',
                                     input_html: { value: f.object.hours == 0 ? '' : f.object.hours, min: 0},
diff --git a/app/views/semester_process_volunteers/index.html.slim b/app/views/semester_process_volunteers/index.html.slim
index 9a0cb615975fae191957c492346db73b52524a0c..08af49792bce8ca7d80350a602c32b65b91a9156 100644
--- a/app/views/semester_process_volunteers/index.html.slim
+++ b/app/views/semester_process_volunteers/index.html.slim
@@ -26,9 +26,9 @@ h1 Semester Prozess
         tr*{ data: { spv_id: spv.id } }
           td.index-action-cell.hidden-print
             = button_link icon_span(:edit), review_semester_review_semester_url(spv), title: 'Bearbeiten'
-            = button_link icon_span(:journal), volunteer_journals_path(spv.volunteer), title: 'Journal'
-            = button_link icon_span(:journal_new), new_volunteer_journal_path(spv.volunteer, sp_volunteer_id: spv.id),
-              title: 'Neuen Journal eintrag mit Zitat erstellen'
+            = button_link icon_span(:journal), polymorphic_path([spv, Journal]), title: 'Journal'
+            = button_link icon_span(:journal_new), new_polymorphic_path([spv, Journal]),
+                title: 'Neuen Journal eintrag mit Zitat erstellen'
             = button_link icon_span(:hours), volunteer_hours_path(spv.volunteer), title: 'Stunden'
           td
             - if spv.commited_at.present?
@@ -36,7 +36,9 @@ h1 Semester Prozess
             - else
               .label.label-warning Unbestätigt
           td= link_to_if policy(Volunteer).edit?, spv.volunteer.contact.full_name, edit_volunteer_path(spv.volunteer)
-          td= render_missions(spv)
+          td.index-action-cell
+            - spv.semester_process_volunteer_missions.each do |spvm|
+              = link_to spvm.mission.to_label, spvm.mission, target: '_blank'
           = td_truncate_content_modal(spv.render_feedback(:goals), 'Ziele', shorten_size: 300)
           = td_truncate_content_modal(spv.render_feedback(:achievements), 'Erfolge', shorten_size: 300)
           = td_truncate_content_modal(spv.render_feedback(:future), 'Zukunft', shorten_size: 300)
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4155fe455f4c2a3f1350d78cf651ed54d0dc385f..a0389658202eaf90268d3ea84b60245c87a39777 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -547,6 +547,17 @@ de:
         working_percent: Stellenprozent
     errors:
       models:
+        event_volunteer:
+          attributes:
+            volunteer:
+              required: muss ausgewählt werden.
+        group_offer:
+          department:
+            blank: Freiwilligenverantwortliche können nur ihrem Standort zugeteilte Gruppenangebote erfassen
+        journal:
+          attributes:
+            user:
+              no_volunteer: Freiwillige können keine Journale verfassen.
         profile:
           attributes:
             avatar:
@@ -557,6 +568,12 @@ de:
               blank: darf nicht leer sein
             last_name:
               blank: darf nicht leer sein
+        semester_process_volunteer_mission:
+          attributes:
+            assignment: &id-mission-relation-insuficient
+              insuficient_relation: Es wird mindestens ein Assignment oder GroupAssignment benötigt
+              too_many_relations: Es darf nur ein Assignment oder ein GroupAssignment verbunden werden
+            group_assignment: *id-mission-relation-insuficient
         user:
           attributes:
             email:
@@ -576,19 +593,6 @@ de:
               spoofed_media_type: Die Inhalte entsprechen nicht ihrer Deklaration
             avatar_content_type:
               invalid: ist ungültig
-        group_offer:
-          department:
-            blank: Freiwilligenverantwortliche können nur ihrem Standort zugeteilte Gruppenangebote erfassen
-        event_volunteer:
-          attributes:
-            volunteer:
-              required: muss ausgewählt werden.
-        semester_process_volunteer_mission:
-          attributes:
-            assignment: &id-mission-relation-insuficient
-              insuficient_relation: Es wird mindestens ein Assignment oder GroupAssignment benötigt
-              too_many_relations: Es darf nur ein Assignment oder ein GroupAssignment verbunden werden
-            group_assignment: *id-mission-relation-insuficient
     models:
       assignment: Begleitung
       feedback: Halbjahres-Rapport
diff --git a/config/routes.rb b/config/routes.rb
index 188a7dd6014880ed9b89a398629c98fc8f856fc6..30f1dc5d5417b24dd73deaaf3ba92a1e06168f01 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -100,9 +100,11 @@ Rails.application.routes.draw do
     put :take_responsibility, on: :member
     put :mark_as_done, on: :member
     put :update_notes, on: :member
+
+    resources :journals
   end
 
-  resources :review_semesters do
+  resources :review_semesters, only: [] do
     get :review_semester, on: :member
     patch :submit_review, on: :member
   end
diff --git a/db/migrate/20190301134418_add_indexes_for_some_created_at_and_updated_at_fields.rb b/db/migrate/20190301134418_add_indexes_for_some_created_at_and_updated_at_fields.rb
new file mode 100644
index 0000000000000000000000000000000000000000..5ae6b628f7a956dab9db3a561bc38b888ddba008
--- /dev/null
+++ b/db/migrate/20190301134418_add_indexes_for_some_created_at_and_updated_at_fields.rb
@@ -0,0 +1,18 @@
+class AddIndexesForSomeCreatedAtAndUpdatedAtFields < ActiveRecord::Migration[5.1]
+  def change
+    add_index :assignments, :created_at
+    add_index :group_assignments, :created_at
+    add_index :group_offers, :created_at
+    add_index :hours, :created_at
+    add_index :hours, :updated_at
+    add_index :semester_feedbacks, :created_at
+    add_index :semester_process_volunteer_missions, :created_at
+    add_index :semester_process_volunteers, :created_at
+    add_index :semester_process_volunteers, :reviewed_at
+    add_index :semester_process_volunteers, :responsibility_taken_at
+    add_index :semester_process_volunteers, :commited_at
+    add_index :semester_process_volunteers, :commit_visited_at
+    add_index :volunteers, :last_billing_expense_on
+    add_index :volunteers, :created_at
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f9d1457043210be15f76721e7b5e8ea6b2800ec7..5b1aec521823916858b3230d9eecdd6318c28c1e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181218094649) do
+ActiveRecord::Schema.define(version: 20190301134418) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -115,6 +115,7 @@ ActiveRecord::Schema.define(version: 20181218094649) do
     t.datetime "pdf_updated_at"
     t.bigint "submitted_by_id"
     t.index ["client_id"], name: "index_assignments_on_client_id"
+    t.index ["created_at"], name: "index_assignments_on_created_at"
     t.index ["creator_id"], name: "index_assignments_on_creator_id"
     t.index ["period_end"], name: "index_assignments_on_period_end"
     t.index ["period_end_set_by_id"], name: "index_assignments_on_period_end_set_by_id"
@@ -374,6 +375,7 @@ ActiveRecord::Schema.define(version: 20181218094649) do
     t.integer "pdf_file_size"
     t.datetime "pdf_updated_at"
     t.bigint "submitted_by_id"
+    t.index ["created_at"], name: "index_group_assignments_on_created_at"
     t.index ["deleted_at"], name: "index_group_assignments_on_deleted_at"
     t.index ["group_offer_id"], name: "index_group_assignments_on_group_offer_id"
     t.index ["period_end"], name: "index_group_assignments_on_period_end"
@@ -442,6 +444,7 @@ ActiveRecord::Schema.define(version: 20181218094649) do
     t.date "period_start"
     t.date "period_end"
     t.text "comments"
+    t.index ["created_at"], name: "index_group_offers_on_created_at"
     t.index ["creator_id"], name: "index_group_offers_on_creator_id"
     t.index ["deleted_at"], name: "index_group_offers_on_deleted_at"
     t.index ["department_id"], name: "index_group_offers_on_department_id"
@@ -466,10 +469,12 @@ ActiveRecord::Schema.define(version: 20181218094649) do
     t.bigint "hourable_id"
     t.bigint "reviewer_id"
     t.index ["billing_expense_id"], name: "index_hours_on_billing_expense_id"
+    t.index ["created_at"], name: "index_hours_on_created_at"
     t.index ["deleted_at"], name: "index_hours_on_deleted_at"
     t.index ["hourable_type", "hourable_id"], name: "index_hours_on_hourable_type_and_hourable_id"
     t.index ["meeting_date"], name: "index_hours_on_meeting_date"
     t.index ["reviewer_id"], name: "index_hours_on_reviewer_id"
+    t.index ["updated_at"], name: "index_hours_on_updated_at"
     t.index ["volunteer_id"], name: "index_hours_on_volunteer_id"
   end
 
@@ -615,6 +620,7 @@ ActiveRecord::Schema.define(version: 20181218094649) do
     t.datetime "updated_at", null: false
     t.index ["assignment_id"], name: "index_semester_feedbacks_on_assignment_id"
     t.index ["author_id"], name: "index_semester_feedbacks_on_author_id"
+    t.index ["created_at"], name: "index_semester_feedbacks_on_created_at"
     t.index ["deleted_at"], name: "index_semester_feedbacks_on_deleted_at"
     t.index ["group_assignment_id"], name: "index_semester_feedbacks_on_group_assignment_id"
   end
@@ -642,6 +648,7 @@ ActiveRecord::Schema.define(version: 20181218094649) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["assignment_id"], name: "semester_proc_volunteer_mission_assignment_index"
+    t.index ["created_at"], name: "index_semester_process_volunteer_missions_on_created_at"
     t.index ["deleted_at"], name: "index_semester_process_volunteer_missions_on_deleted_at"
     t.index ["group_assignment_id"], name: "semester_proc_volunteer_mission_group_assignment_index"
     t.index ["semester_process_volunteer_id"], name: "semester_proc_volunteer_mission_index"
@@ -661,9 +668,14 @@ ActiveRecord::Schema.define(version: 20181218094649) do
     t.datetime "deleted_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["commit_visited_at"], name: "index_semester_process_volunteers_on_commit_visited_at"
+    t.index ["commited_at"], name: "index_semester_process_volunteers_on_commited_at"
     t.index ["commited_by_id"], name: "index_semester_process_volunteers_on_commited_by_id"
+    t.index ["created_at"], name: "index_semester_process_volunteers_on_created_at"
     t.index ["deleted_at"], name: "index_semester_process_volunteers_on_deleted_at"
+    t.index ["responsibility_taken_at"], name: "index_semester_process_volunteers_on_responsibility_taken_at"
     t.index ["responsible_id"], name: "index_semester_process_volunteers_on_responsible_id"
+    t.index ["reviewed_at"], name: "index_semester_process_volunteers_on_reviewed_at"
     t.index ["reviewed_by_id"], name: "index_semester_process_volunteers_on_reviewed_by_id"
     t.index ["semester_process_id"], name: "index_semester_process_volunteers_on_semester_process_id"
     t.index ["volunteer_id"], name: "index_semester_process_volunteers_on_volunteer_id"
@@ -802,10 +814,12 @@ ActiveRecord::Schema.define(version: 20181218094649) do
     t.index ["active"], name: "index_volunteers_on_active"
     t.index ["activeness_might_end"], name: "index_volunteers_on_activeness_might_end"
     t.index ["birth_year"], name: "index_volunteers_on_birth_year"
+    t.index ["created_at"], name: "index_volunteers_on_created_at"
     t.index ["deleted_at"], name: "index_volunteers_on_deleted_at"
     t.index ["department_id"], name: "index_volunteers_on_department_id"
     t.index ["external"], name: "index_volunteers_on_external"
     t.index ["invited_at"], name: "index_volunteers_on_invited_at"
+    t.index ["last_billing_expense_on"], name: "index_volunteers_on_last_billing_expense_on"
     t.index ["nationality"], name: "index_volunteers_on_nationality"
     t.index ["rejected_at"], name: "index_volunteers_on_rejected_at"
     t.index ["resigned_at"], name: "index_volunteers_on_resigned_at"
diff --git a/test/controllers/journals_controller_test.rb b/test/controllers/journals_controller_test.rb
index 8ffa27be0ddefe5cfb9ccee0bc7601cea19e22db..974ce8f3b5fdf84a1e774deac73e6c67321b8c66 100644
--- a/test/controllers/journals_controller_test.rb
+++ b/test/controllers/journals_controller_test.rb
@@ -13,7 +13,7 @@ class JournalsControllerTest < ActionDispatch::IntegrationTest
     @spv = create(:semester_process_volunteer, volunteer: @volunteer)
     @semester_feedback = create(:semester_feedback, :no_mission, semester_process_volunteer: @spv, volunteer: @volunteer)
 
-    get new_volunteer_journal_path(@volunteer, sp_volunteer_id: @spv.id)
+    get new_polymorphic_path([@spv, Journal])
     @journal = @controller.instance_variable_get(:@journal)
     assert_equal @journal.category, 'feedback'
     assert_equal @journal.title, "Semester Prozess Feedback vom #{I18n.l(@semester_feedback.created_at.to_date)}: "
diff --git a/test/factories/users.rb b/test/factories/users.rb
index 834f32210df404140ddd9702b91186020171ffa0..e6335ea3fee084a26340479a87ae412b9b7532d1 100644
--- a/test/factories/users.rb
+++ b/test/factories/users.rb
@@ -18,6 +18,10 @@ FactoryBot.define do
       role User::VOLUNTEER
     end
 
+    trait :admin do
+      role User::SUPERADMIN
+    end
+
     trait :department_manager do
       role User::DEPARTMENT_MANAGER
     end
@@ -38,6 +42,7 @@ FactoryBot.define do
       profile {}
     end
 
+    factory :admin, traits: [:admin]
     factory :social_worker, traits: [:social_worker]
     factory :department_manager, traits: [:department_manager, :with_department]
     factory :department_manager_without_department, traits: [:department_manager]
diff --git a/test/system/journals_test.rb b/test/system/journals_test.rb
deleted file mode 100644
index b09de012447ab652b6eef775c52d7958e734285c..0000000000000000000000000000000000000000
--- a/test/system/journals_test.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-require 'application_system_test_case'
-
-class JournalsTest < ApplicationSystemTestCase
-  def setup
-    @superadmin = create :user
-    @department_manager = create :user, :department_manager
-    @volunteer = create :volunteer, registrar: @department_manager, acceptance: :accepted
-    @volunteer.journals = [FactoryBot.create(:journal, user: @volunteer.user)]
-    @journal_volunteer = @volunteer.journals.reload.first
-  end
-
-  def volunteer_has_link_to_their_journal_entry_as user
-    login_as user
-    visit volunteer_path(@volunteer)
-    first(:link, 'Journal').click
-
-    assert_link @journal_volunteer.user.full_name
-    assert_text @journal_volunteer.body
-  end
-
-  test 'volunteer has link to their journal entry as a superadmin' do
-    volunteer_has_link_to_their_journal_entry_as @superadmin
-  end
-
-  test 'volunteer has link to their journal entry as a department manager' do
-    volunteer_has_link_to_their_journal_entry_as @superadmin
-  end
-
-  def can_create_journal_as user
-    login_as user
-    visit client_journals_path(create(:client))
-    click_link 'Journal erfassen', match: :first
-
-    assert_text 'Journal erfassen'
-
-    fill_in 'Titel', with: 'Bogus Title'
-    fill_in 'Text', with: 'My bogus demo text body, just for this test.'
-    select 'Telefonat', from: 'Kategorie'
-    click_button 'Journaleintrag speichern'
-
-    assert_text 'Journal wurde erfolgreich erstellt.'
-    assert_text 'Bogus Title'
-    assert_text 'My bogus demo text body, just for this test.'
-  end
-
-  test 'can create journal as superadmin' do
-    can_create_journal_as @superadmin
-  end
-
-  test 'can create journal as department manager' do
-    can_create_journal_as @department_manager
-  end
-
-  def can_edit_journal_as user
-    login_as user
-    visit volunteer_journals_path(@volunteer)
-    click_link 'Bearbeiten'
-
-    assert_text 'Journal bearbeiten'
-
-    fill_in 'Text', with: 'New text'
-    click_button 'Journaleintrag aktualisieren'
-
-    assert_text 'Journal wurde erfolgreich geändert.'
-    assert_text 'New text'
-  end
-
-  test 'can edit journal as superadmin' do
-    can_edit_journal_as @superadmin
-  end
-
-  test 'can edit journal as department manager' do
-    can_edit_journal_as @department_manager
-  end
-
-  def can_delete_journal_as user
-    login_as user
-    visit volunteer_journals_path(@volunteer)
-
-    assert_text @journal_volunteer.body
-
-    click_link 'Bearbeiten'
-
-    assert_text 'Journal bearbeiten'
-
-    page.accept_confirm do
-      click_link 'Löschen'
-    end
-
-    assert_text 'Journal wurde erfolgreich gelöscht.'
-    assert_text 'Journal Liste'
-    refute_text @journal_volunteer.body
-  end
-
-  test 'can delete journal as superadmin' do
-    can_delete_journal_as @superadmin
-  end
-
-  test 'can delete journal as department manager' do
-    can_delete_journal_as @department_manager
-  end
-end
diff --git a/test/system/semester_feedback_test.rb b/test/system/semester_feedback_test.rb
index 0b05fbb1aef62a1d9df638349e290b867a49164c..3ee378cff153e3283f1b45754501f40a5420b31f 100644
--- a/test/system/semester_feedback_test.rb
+++ b/test/system/semester_feedback_test.rb
@@ -144,24 +144,5 @@ class SemesterFeedbackTest < ApplicationSystemTestCase
     page.find('td', text: comments.truncate(300)).click
     assert page.has_text? comments
     click_button 'Schliessen'
-
-  end
-
-  test 'it should create a journal on submit' do
-    volunteer = create :volunteer_with_user
-    spv = create(:semester_process_volunteer, :with_missions, :with_mail, volunteer: volunteer,
-      semester_process: create(:semester_process))
-    login_as volunteer.user
-    visit review_semester_review_semester_url(spv)
-
-    assert_difference 'Journal.count', 1 do
-      fill_in_required_feedback_fields(0)
-      fill_in_required_feedback_fields(1)
-      check 'Ich verzichte auf die Auszahlung von Spesen.'
-      click_on 'Bestätigen', match: :first
-      spv.reload
-    end
-    assert Journal.last.body.include? volunteer.assignments.first.to_label
-    assert Journal.last.body.include? volunteer.assignments.second.to_label
   end
 end