Basket page fixes