Spree layout + fixes
up