layout update and offset

layout update and offset