Added extra buttons and improved speed

Improved speed with some weird mechanic featuring calling actions with
an <int> VS using a parameter from the outer scope in an action