Some layout improvements.