Some more work, also with the preference pages.