added code consitent with layout