tab cleanups and new mouse