Layout fixes: small bugs + small refactoring
another testcases and timings update