Issue #19 + layout verdeling. To Do: layout afwerken