Code clean up, update category search and display