Start adding search and a better layout