Changed to one controller for modal