Various improvements to pages