Unify make_button() methods