Add tray bar icon and fix a drag and drop bug.
Merging?