Fixed javascript functionality
Fixed merge conflicts, added javascript functionaltiy