Added HTML tags and other updates