Shift modal

It looks like I would have to open a new PR to do that and close this one. Are you ok with that?