probably resolved gui bugs