[style] General layout improvements.