Fix button actions