Layout development and improvements