rules ui refactoring + some fixes

fixes #39