Update code to work with new layout
-- update add / remove / edit methods
-- added IBOutlets for labels
-- set edit button enabled based on type