Add OptionMenu

Change-Id: I06afec3d6c474724a2d8e85882303c3ee831904f