There should be more organization in the different categories. for example: all the different types of water should be beside each other instead of spread out so salt water, carbonated water, distilled water and water would be beside each other. or in solids all of the flammable materials would be beside each other so it is easier to find a material that you need.
I thing all of the elements are in the right category but they should be sorted better