- Changes as per latest layout