made changes for new layout