Fix bug; add SWP and VT bar options
Adjust options menu
TOC