Some layout improvements and generifications.