Improved html format