commented out extraneous css
merged css changes & updated code