More aesthetic changes

Hopefully this will work this time.