Better sort button placement and handling.