Development - (Settings) Added validation for required fields