Fixed html issues