Fixed the toggle button portion of  #29, will continue working on it.