Simplify optional section display
Better 404