Button handling now done by buttons!