picture cleaning and improvements on auto layout