Some layout improvements