Taking some javascript out of jsp

Cleaning up