Added Ability to Close Modal

Also tweaked the tap/drag stuff