Layout changes and improvements