Messing around with the modal
More modal stuff
Fixed a bug with the closing of the modal