cleaned up code, added partials for forms, and before labels as not to DRY