- Fixed loading issue, although it still sometimes requires multiple reloads