HTML beautify + bugs fix