Layout changes. Comments added