Fixed html generation