add some icons, improved equipment structure