Refactor draw elements#100

felix-andreas wants to merge 2 commits intomainfelix-andreas/apace:mainfrom

refactor-draw-elementsfelix-andreas/apace:refactor-draw-elementsCopy head branch name to clipboard