Fixes for the single page template. Not sure why everything fell apart when I committed, but it sure did...