Added preferences for what to display on the watch face, and reorganized pref code.