style tweaks
merging css