Move logic for XS and reverse template from Store to View