fixing layout, tabs and sorting
changed store to use ids