moved some things around html. cleaned things up a bit.