Merge branch 'feature/newLayout' into release