layout updates and improvements