Fix whip-around name field styling
Merge remote-tracking branch 'origin/dev' into dev