Merge branch 'MLAB-637' into 'testing'

format pages, remove row formatting

See merge request !150