Restyle more menu.

Change-Id: I1684a6fc591c5f4f222c2139c98ddf5e6ec4ce9d