Remove unnecessery scope
Fix toggler scope bug
Use if-else
Fix progress style