FIX::button improvement