rewrote a few widgets + index