Some layout container improvements