some layout improvement