Merge pull request #28 from alfeko/master

ui fix
Merge pull request #32 from alfeko/master

UI Update
Fixed isEnabled=false bug
Merge pull request #35 from alfeko/alexbranch

Alexbranch