minor refactoring, dragging event binded
added rule changing UI
Merge branch 'develop'