Added raphael, and some markup changes