Changed Class Names, Added Custom Adapter