Updated jade templated, made things a bit prettier