Solved minor lint issues and changed event so related labels won't vanish when parent label is activated/clicked
Merge conflict resolved