Revert "Swaped listeners"

This reverts commit 508e06a0847100c744ce5f86df33faf180bcd1d3.
Revert "Height fix when is not visible during binding"

This reverts commit 7543d35cc502165b0faf03c0d84280d36a0f514a.