Move mousetrap into separate file
Add form modal to create issues