Reworked non-standard rules and how they are displayed.