Fixed buttons binding
Update