add basic search, fix look of buttons