Combine views and update to Spree usage along with drag sorting