add search and better layout and btn-primary