fixing rules page
more forms
merge fixed