Working to enhance layout