Bugfix/eugene/html issues

Small improvements :-)