Refining button behavior