20140825-Wish to fix the toggle button But seems need more time.