Modify edit to incorporate both module and application
Correct automagical generation of id's