Tidy up notification rules form and display