Add x to close modal
Update styling on x button
Minor refactor