Adding transition helper and fixing visibility helpers