Address app challenges

From chq_marketing_DOTCOM_contributors