Fixing problem with empty list and adding context menu