more updates to layout