further reordering & layout changes