#110 Adapt display of page-level buttons