Some layout improvement