few more layout changes