Made the modal views and forms generic just like the chooser.