refactoring

some changes on loading components