WIP: improve new design #18

Draft
kritzl wants to merge 1 commit from new-design into main