Some performance improvements, added icons, style improvements