Feature/editor day1

Julian Dreuthrequested to merge
feature/editor-day1 into dev

Added some small features, did some refacturing for better code structure

Merge request reports