use glade and gtk::builder for prefs dialog
move sort order option to prefs dialog
Fix merge conflicts