Showing visual distinction between mouse-over focus and 'same entity' focus. Also some fixes.