Style tweaks

Things are looking quite a bit nicer.