fixed the loading issue + some style changes