Small refactor for preferences

Use <label> tag instead of plain text in forms.

Change-Id: I022fb44a749992078d0d5fe8944e38c8122d500a
Merge "Small refactor for preferences"