fixed multiple add  of tags and some layout
Merge branch 'groep_acht' into groep7