Replace class based lookups with data-target references

Signed-off-by: Don Naegely <naegelyd@gmail.com>