Small button styling change
Fix search/sort bug