working on a better layout