Now works with new layout, need to fix tests