improve consistency with last/first cell classes

and Revert selection changes