Fix bugs and styling issues with the modal