Fixing name issue
Merging branches to fix issues
Installing simple_form and modifying forms