Adding Loading Indicator back in

This PR (FaridSafi#191) was removed in a code refactor and cleanup seen here (FaridSafi@14c4613#diff-e574d057fb2c5e71b74e6125228256e3). I still need this as the default was not working. This is just adding that code back in.