Fix disabled button
Refactor