Make sure buttons are natural width
Add additional action types