Made all Widgets not static & finished gear widget