Update the editor component to accomodate the new master table

First need to review and agree on hte master table structure