Remove method
Refactor, Centralized block icon register & Added active state for the remaining machines