Fix button trigger and persistance