Implemented rules section collapsing/expanding
Merge branch 'dev'