Layout adjusted