layout improvements
id update