Move toggling out into the main file, and upgrade to using panels.
Update the spec to get rid of deprecated things.