fix for mobile
Merge branch 'homequestion' into testing