Fixed edit message passing
Split edit and save functions
Corrected fields in companies; Added tableName in companies
Minor table name additions
Minor fixes