Initial commit.
UI Tweaks.
Removed problematic selector.
Merge pull request #348 from larz0/master

Various UI tweaks.
added some merging logic
add missing event handler