Small layout improvement