Make menu entries narrower and add line separator

Change-Id: I6a34b942874b0815b8fdf54d16357b184139bc03
Merge "Make menu entries narrower and add line separator"