Refactor partials on forms on most objects and added some fields