Fixing up other pages