fixed css bug and a lot of cleanup