Seperate buttons from listeners