[UPDATE] layout changes