refactored rules, app basics
ui tuning