css tweaks, text edits
adjusted wording
resolving conflicts