Added checkboxes for normal & expansion stages
Implemented functionality for turning on/off normal & expansion icons