a few layout changes