interim fix without clustering
revised layer loading
merged
added loading indicator
added spin