several layout improvements