few layout updates