Even more work on preference page