working on the layout part