Generic layout improvements