More layout improvements.