fixed element buttons not appearing in watch lists
synced up watch handlers
Merge pull request #2271 from Steell/master

Elements in lists now have focus buttons in Watch Node: MAGN-4347