css styling and java script
 merged changes