Remove dead code
Add animation
Refine system components in search results