Add nested columns layout
Add nested columns style
Merge branch 'feature/improve-test' into develop