Clean up button enable/disable logic