bugfixes after layoutmanager update