Custom layout improvements.