Extensive work on General Settings Page