Fixed displaying "no results" for Search Cleaned up code
Main menu items are refactored, except Now Playing