Merge pull request #187 from jamesyothers/master

rules view and templates restructured
fix tab bug in rulesView