Layout is now much better with flexboxes