Improved consistency and user-centeredness of preferences.
Merge pull request #209 from Frenzie/master

Improved consistency and user-centeredness of preferences.