Some iPad/no-flexbox fixes
Merge branch 'feature'
removed duplicate function call caused due to possible git error
Merge branch 'feature'