Fixing various broken pages