further layout changes