Changed button behaviour