Merged the mockup into the actual site based in Web API