lot of changes for new layout