Use spinner instead of Loading.. message for sections of edit case
Merge branch 'edit'