Clean up section nav

This addresses issues #67 and #34.