Aesthetic tweaks
Merge branch 'dev' into beta