Rework some of the strings and preferences.

Change-Id: I534c984f67f6f2d669feaaf4fd1e7e2f352f721c
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>