Style changes proposed by @skyluc
Show the name of the entity in the label
Added a context menu