Improve CSS and update test case