General layout improvement