Merge "Fixed imports in categorized views"