Fixing flexbox dependencies
Merging dev