Change to middleman and new look & feel