Merging latest -dashboard and cart changes