Fixed widget a bit, needs more work