buttons + little changes