Improve page-nav affix, tidy markup and CSS