public marks

PUBLIC MARKS from emmanuelc with tags mise_en_page & collapsible