made everything a bit nicer

still need to go through and see how much of this i can strip out, but
for now this looks a bit better :)