Improve visibility toggle