menu improvement and fix