Font size prefs added
Merge branch 'prefs'