Eye candy. Fixed some problems in generated html