Some style changes and support to be merged with jsbin core