Fix #1054, make modals a little bit bigger too