Cgi html fixes to match static html