refactored add/edit bookmark controller to ensure modal version use the same controller as non-modal