changes for new layout