fixed list model bug, moved store to separate file