further layout updates