Fix button, update controllers