fixed for the mobile
Merge branch 'homequestion' into testing