more changes to layout