Resolve "Improve Design"

Markus Sommerrequested to merge
208-improve-design into develop

Closes #208 (closed)

Edited by Markus Sommer

Merge request reports