A few layout improvements