couple of stylistic tweaks
Merge remote-tracking branch 'origin/wagtaildemo2' into wagtaildemo2