Implement Fabian's suggestions
Merge branch 'front' into rmetzger_preview