Updated to suit changes to bb-server and html-builder