Move no-sxs logic into template. Use pretty section number