More minor updates to loading and views.