Just add redeploy button. So, after deploy phase you can have two buttons, redeploy and attack. Also, reroll during choice. Just 3 rerolls after every turn would have saved me a lot of save scumming :)
