Fixed highlighting of active search result when having focus
Cleaned up and restructured all css and class names