The best thing to do is add/remove classes as Robert as done.  
The fast thing to do is use show/hide. 
Since we have been sprinting to get these addons done, it's nice to go back and clean that codesmell up.