changes in css for form design
conflict merged