Cleanup markup and enhance grid for search bar