Changing how I'm mapping
Refactoring Html helpers