add form helpers to reward page
style comments and add more attributes to users
merge conflict schema fix