Port Gesture controls menu structure for Bacon

Change-Id: I9fd9b0965cbe8fa08a06e4f75e355115729f3360