This part of the modal is getting ugly, which I'm okay with for the time being. Just make sure fixing it up is captured in a bug somewhere (create one if one doesn't exist) and link it.