fix layout in IE etc. some script improvement
merged conflit