Settings cleanup and improvements