Make slide numbering count only non-layout slides.
Fix broken presenter mode.