Fix content view definitions locators
Fix defelements inefficiency

* would re-evaluate the passed in map whenever something needed to be
  looked up in it.  Fixed by closing over the value
Upgrade selenium