few layout changes