Refactoring and performance boosts
Added ProgressIndicator class (unused as of now)