fixed flexbox helper classes
fixed conflicts