add decorators with draper gem
correct conflicts
correct typo