general layout improvement