HTML changes

Changes made after code reviewed by @Rumyra