changes for layout, working with matt