Html improvements, 

multiple improvements, see commits