Improved excerpts and nav