Preferences view is feature complete
Merge conflicts resolved