some css changes
merging