Updated  Layout