Beautified html
Updated lots