Changed Button Click Behaviour