Added a css and beefed up client and spec