replace layout with Brick based components