who: trying to improve the layout