Better laying out of components