Loading issue and widget framework js issues fixed