click listeners work again and startup is a bit faster