added icons
many improvements