Neating and making the buttons remember states