Some layout improvements...