fix bug: fix the loading element position
Merge branch 'development'