Cleaned up map keys and glow hide/show code