[WO-621] Put primary button on top when choosing