Fixes the structure. Now will finish up the icons.