Refactoring stuff with recent best practices. Adding a variable dependant throbber