Quick fixes for responsive [#51613273]
More tweaks [#51613273]
Merge branch 'feature-51613273-Quick_responsive_fixes'