Visual tweaks
Stupid merge conflict