Some more organization. Dunno what to do with glyphcons yet