who: a further attempt at a better layout