I agree on this as well.

The Revenge button is a good addition. Though it needs some sort of tweaking or limitations (time).