Cleaned up Setting pages