Adjust close button position when when adding new variables/events

[rofl-er]

The close button is within the modal and the other two buttons are within the form. All buttons should go into one place.