Restore events binding - correct infinite loading - integrate loader