Some changes to fix models functionality (nof fixed yet). Highlighting
row(s) in modal & machine tables by clicks.