Node add/delete/update refreshes label list

Also, refactoring