redid styling updates - tests to follow?
finished round 1 of styling