worked on pic/layout change