move Expand*, toprows to the client. toprows is either 2 or 1 when swap is hidden