added MainScreen & updated Search and Category