Revert "Design changes (Vorschlag)"

This reverts commit 5125cb13db345942905a5e87eb40b20c983e209b.