Added css and refactored test