All settings fields returning from database
Cleared some comments