Layout updates and improvements.