Extensive work on Settings Pages