Added Testing, Refactored some code, More CSS