Fix scaling
Minor tweaks for flexbox2