Removed the use of ID's from the javascript