Added loading to all pages

Added loading to all pages
Refactor promises