menu improvement and fix
Merge pull request #628 from takeit/tw-temp

menu improvement and fix