More feedback from Josh and Cathy

Mostly styling tweaks