more updates on the layout