Visual Tweaks

These changes go on top of the previous pull request I sent. I did these separately in case you didn't care for the changes :)