#6 #7 #8 initial layouts
#6 #7 #8 initial layouts
Merge branch 'feature/newlayouts' into develop