Converted to use ID as target

Classes were initially used as the target element, now ID's will provide less ambiguity.