Updating to modern flexbox