Added info window code + performance improvements
Removed unnecessary code