Similar to Next button not changing to done in final step but I still think it behaves badly currently?