Layout changes incorporated.