Tidy settings pages

More tidies