Refactoring and new util functions
Code cleanup
Code cleanup and loading indication handling
UI updates