Redesign: factor code in bib btn.