Bug fixes - Add / edit now fully operational

Bug fixes - Add / edit now fully operational