added flexbox fallback
resolving merge conflicts