Changes with RulesPanel
changes
Merge pull request #293 from HoltMaki/master

Rules Panel work