- #2 add first layer for logic rules in user interface
- #1 improve controllers and models, fix model issue