Better menu and sync with WebApp