Inline nickname tweaks

Add margin so that they don't break lines when they appear by themselves