Merge Rules Page into develop branch

Completion of the Rules Page, merging into develop to bring my develop branch up to date.