Move button handler into controller