Change selector names and location
Make flex wrap it's own utility
Merge branch 'feature/refactor' into develop