More work on new preference page