Bus resizing bug at app restart fixed; refactoring