Adding some styling and fixing failing specs