pom (and menu) fixed

Change-Id: I24866c5caf03e0279ac567c42cbc888024372a05