add better layout