Merge pull request #127 from jitlogic/dev1

Dev1
Merge pull request #128 from jitlogic/dev1

Dev1
Rudimentary support for JMS (not tested yet).
Minor UI fixes.