Refactored Classes, Changed some logic, Added Css