updating layout and tests
Merge branch 'develop' of github.com:blitzagency/rich into develop