Tiny changes to improve show elements display