Changed simple .toggle for a more robust method