Fixed widget repeated rendering bug, wrapped one more form with timing macro