fixed some of selection page