Artwork visible toggle fixes