Changed the location of a few onclick events.