Added/modified some widget stuff.