Cleaned up new Company screens for _form, index, new and show