Several layout improvements