Update #52 : switch, remove and rename baskets. Improve UI.