more look and feel tweaking. removed javascript .contains method calls, as it is not cross browsers compatiable