modified views based on spree 2-1-stable