added some css changes
merged changes