Made some CSS changes and added test, not all tests pass yet..