Refine button behaviour