Add quotes +  minor styles