some edits for settings catagories

Change-Id: Ic5e26a5886b28c9f3630ff4f615e4504b663cfe3