EDITING: Make the add module modal UX intelligent

Fixes #528