update ty for 7.0
updated 6 and 7 layouts