I just made an update:
I think this modal is due for some bigger layout changes… but for now some fixes: