Added scrollspy, other cleanup