Merge pull request #1 from Kunstmaan/master

Update from original
Made the modal views and forms generic just like the chooser.
Merge pull request #168 from bureaublauwgeel/master

Made the modal views and forms generic for the chooser.