udpated layout