Fixed some issues with the badges reacting to step changes, the dialogs still may need fixed.
fixing conflicts with android version