Fixing up show everywhere