Replace class based lookups with data-target references

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Merge pull request #672 from cbmi/issue-444

Replace class based lookups with data-target references