did a lot of minor fixes
minor
removed unused imports
added the disabled icon as default