Fixing up settings page