Recommit Layout sections

Updated