Take two... fixing HTML Elements class and adding textarea field

Issue #1801