adding styling changes
merge conflicts resolved dec 18