component loading issues fixed