Fixed HTML

Fixed HTML
Errors fixed

Errors fixed
Fixed errors
Merge remote-tracking branch 'george/master'
Fixed it
removed some un-used code
Unfixed

Unfixed