fix layout of naughty and typo in jolene
Merge branch 'master' into fonts