Registration layout improvements.