CSS changes
misc. edits
fixed merge issue