instead of defining menus in code. And revise some style. Change-Id: I0a5a19a51062d72cdb9045c9607cab04b69f554c