Rehaul of Spree layout