Edits for better HTML rendering