Settings changes and few improvements