CF: Uniformity

* Pie doesn't need drawers
to-do next: give persistence options a normal look

Change-Id: I0bfe5c31318513ea969413ade36b12e789d64a0e
rearrangement

Conflicts:
	res/xml/preference_headers.xml