Cosmetics

Every now and again I do a fresh install and fix some things that's been bothering me.