Code cleanup
Bugfix: re-added modal id, as it is actually used... oops