Fix search, category display, buttons