[FIX]: fix some issues, need to find solution for menu