fixing scrollspy. also minor organizational changes