re arrange customization options

Change-Id: Ieee096b607a3e8844a01a3f5e9bb038d49f141a4