Improve layout using flex

I think rather than having a row, we should keep with the standard block level layouts.