Feature/#149 redesign rules page

There was a merge conflict. This has now been fixed and the code correctly formatted.