* make glimmer component and remove extra lable, fix styling

* remove commented out code

* remove extra label for when disabled as well