Improve layout using flex

I'm unclear what these margin adjustments are for.  I clicked them off and the layout didn't seemed to be affected.