styling changes evening Dec 17
merge conflicts resolved