Better handling of btn switch