XHTML clean-up. Started reformatting Preferences. Fixed some hard-coding