loading fix, style fix