Fixing specs and couple of minor CSS changes