Moved javascript over as well