More layout improvements