changed layout, updated fixtures