Merge pull request #38 from alfeko/master

update with alex + mattson
UI Tweak

Did stufff, didnt burn
Merge pull request #39 from alfeko/dmpbranch

Dmpbranch