continued working on layout